From 1ce591a6c54d438550b7a261065cd8b62a95492b Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Thu, 1 Dec 2022 03:18:41 +0300
Subject: [PATCH] Partially fix strange issue with subghz decode raw

---
 applications/main/subghz/scenes/subghz_scene_decode_raw.c | 3 +++
 applications/main/subghz/scenes/subghz_scene_save_name.c  | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/applications/main/subghz/scenes/subghz_scene_decode_raw.c b/applications/main/subghz/scenes/subghz_scene_decode_raw.c
index 7ce5a8b3a..6194d0dba 100644
--- a/applications/main/subghz/scenes/subghz_scene_decode_raw.c
+++ b/applications/main/subghz/scenes/subghz_scene_decode_raw.c
@@ -212,6 +212,9 @@ bool subghz_scene_decode_raw_on_event(void* context, SceneManagerEvent event) {
         case SubGhzCustomEventViewReceiverBack:
             subghz->decode_raw_state = SubGhzDecodeRawStateStart;
             subghz->txrx->idx_menu_chosen = 0;
+            subghz->in_decoder_scene = false;
+            subghz->in_decoder_scene_skip = false;
+
             subghz_receiver_set_rx_callback(subghz->txrx->receiver, NULL, subghz);
 
             if(subghz_file_encoder_worker_is_running(subghz->decode_raw_file_worker_encoder)) {
diff --git a/applications/main/subghz/scenes/subghz_scene_save_name.c b/applications/main/subghz/scenes/subghz_scene_save_name.c
index 9be3ad9a9..7ba61c728 100644
--- a/applications/main/subghz/scenes/subghz_scene_save_name.c
+++ b/applications/main/subghz/scenes/subghz_scene_save_name.c
@@ -89,7 +89,9 @@ bool subghz_scene_save_name_on_event(void* context, SceneManagerEvent event) {
         if(!(strcmp(subghz->file_name_tmp, "") == 0) ||
            scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) !=
                SubGhzCustomEventManagerNoSet) {
-            furi_string_set(subghz->file_path, subghz->file_path_tmp);
+            if(!subghz->in_decoder_scene) {
+                furi_string_set(subghz->file_path, subghz->file_path_tmp);
+            }
         }
         scene_manager_previous_scene(subghz->scene_manager);
         return true;