From a3cf592f298c93ffb3af71a10fd1f62466223b33 Mon Sep 17 00:00:00 2001
From: gid9798 <30450294+gid9798@users.noreply.github.com>
Date: Tue, 9 May 2023 22:16:52 +0300
Subject: [PATCH] Minor fixes

---
 .../main/subghz/helpers/subghz_txrx.c         |  7 +++++-
 .../main/subghz/helpers/subghz_txrx.h         |  2 ++
 applications/main/subghz/subghz_i.c           | 24 +++++++++----------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/applications/main/subghz/helpers/subghz_txrx.c b/applications/main/subghz/helpers/subghz_txrx.c
index a96004046..c1f519ba0 100644
--- a/applications/main/subghz/helpers/subghz_txrx.c
+++ b/applications/main/subghz/helpers/subghz_txrx.c
@@ -80,7 +80,7 @@ void subghz_txrx_set_preset(
 
 const char* subghz_txrx_get_preset_name(SubGhzTxRx* instance, const char* preset) {
     UNUSED(instance);
-    const char* preset_name = NULL;
+    const char* preset_name = "";
     if(!strcmp(preset, "FuriHalSubGhzPresetOok270Async")) {
         preset_name = "AM270";
     } else if(!strcmp(preset, "FuriHalSubGhzPresetOok650Async")) {
@@ -198,6 +198,7 @@ static bool subghz_txrx_tx(SubGhzTxRx* instance, uint32_t frequency) {
         subghz_txrx_speaker_on(instance);
         instance->txrx_state = SubGhzTxRxStateTx;
     }
+
     return ret;
 }
 
@@ -245,11 +246,13 @@ SubGhzTxRxStartTxState subghz_txrx_tx_start(SubGhzTxRx* instance, FlipperFormat*
                     } else {
                         ret = SubGhzTxRxStartTxStateErrorParserOthers;
                     }
+
                 } else {
                     FURI_LOG_E(
                         TAG, "Unknown name preset \" %s \"", furi_string_get_cstr(preset->name));
                     ret = SubGhzTxRxStartTxStateErrorParserOthers;
                 }
+
                 if(ret == SubGhzTxRxStartTxStateOk) {
                     //Start TX
                     furi_hal_subghz_start_async_tx(
@@ -258,6 +261,8 @@ SubGhzTxRxStartTxState subghz_txrx_tx_start(SubGhzTxRx* instance, FlipperFormat*
             } else {
                 ret = SubGhzTxRxStartTxStateErrorParserOthers;
             }
+        } else {
+            ret = SubGhzTxRxStartTxStateErrorParserOthers;
         }
         if(ret != SubGhzTxRxStartTxStateOk) {
             subghz_transmitter_free(instance->transmitter);
diff --git a/applications/main/subghz/helpers/subghz_txrx.h b/applications/main/subghz/helpers/subghz_txrx.h
index edd7fa81d..fd7c024b8 100644
--- a/applications/main/subghz/helpers/subghz_txrx.h
+++ b/applications/main/subghz/helpers/subghz_txrx.h
@@ -1,5 +1,7 @@
 #pragma once
+
 #include "subghz_types.h"
+
 #include <lib/subghz/subghz_worker.h>
 #include <lib/subghz/subghz_setting.h>
 #include <lib/subghz/receiver.h>
diff --git a/applications/main/subghz/subghz_i.c b/applications/main/subghz/subghz_i.c
index 243a1a123..205c7ca02 100644
--- a/applications/main/subghz/subghz_i.c
+++ b/applications/main/subghz/subghz_i.c
@@ -130,7 +130,7 @@ bool subghz_key_load(SubGhz* subghz, const char* file_path, bool show_dialog) {
 
         furi_string_set_str(
             temp_str, subghz_txrx_get_preset_name(subghz->txrx, furi_string_get_cstr(temp_str)));
-        if(temp_str == NULL) {
+        if(!strcmp(furi_string_get_cstr(temp_str), "")) {
             break;
         }
 
@@ -270,17 +270,6 @@ bool subghz_get_next_name_file(SubGhz* subghz, uint8_t max_len) {
     return res;
 }
 
-void subghz_save_to_file(void* context) {
-    furi_assert(context);
-    SubGhz* subghz = context;
-    if(subghz_path_is_file(subghz->file_path)) {
-        subghz_save_protocol_to_file(
-            subghz,
-            subghz_txrx_get_fff_data(subghz->txrx),
-            furi_string_get_cstr(subghz->file_path));
-    }
-}
-
 bool subghz_save_protocol_to_file(
     SubGhz* subghz,
     FlipperFormat* flipper_format,
@@ -321,6 +310,17 @@ bool subghz_save_protocol_to_file(
     return saved;
 }
 
+void subghz_save_to_file(void* context) {
+    furi_assert(context);
+    SubGhz* subghz = context;
+    if(subghz_path_is_file(subghz->file_path)) {
+        subghz_save_protocol_to_file(
+            subghz,
+            subghz_txrx_get_fff_data(subghz->txrx),
+            furi_string_get_cstr(subghz->file_path));
+    }
+}
+
 bool subghz_load_protocol_from_file(SubGhz* subghz) {
     furi_assert(subghz);