Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware

into xfw-dev
Flipper-XFW · Jan 23, 2024 · f821c4c · f821c4c
2 parents b833eba + 46eec3f
commit f821c4c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c b/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
@@ -590,7 +590,11 @@ static void nfc_protocol_support_scene_emulate_on_enter(NfcApp* instance) {
     } else {
         widget_add_string_element(widget, 90, 13, AlignCenter, AlignTop, FontPrimary, "Emulating");
         if(!furi_string_empty(instance->file_name)) {
-            furi_string_set(temp_str, instance->file_name);
+            furi_string_printf(
+                temp_str,
+                "%s\n%s",
+                nfc_device_get_name(instance->nfc_device, NfcDeviceNameTypeFull),
+                furi_string_get_cstr(instance->file_name));
         } else {
             furi_string_printf(
                 temp_str,

diff --git a/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c b/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c
@@ -63,6 +63,10 @@ bool subghz_scene_frequency_analyzer_on_event(void* context, SceneManagerEvent e
 #ifdef FURI_DEBUG
                 subghz_last_settings_log(subghz->last_settings);
 #endif
+                // Disable Hopping before opening the receiver scene!
+                if(subghz->last_settings->enable_hopping) {
+                    subghz->last_settings->enable_hopping = false;
+                }
                 subghz_last_settings_save(subghz->last_settings);
             }