diff options
| author | Skorpionm <85568270+Skorpionm@users.noreply.github.com> | 2022-02-08 21:41:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-08 21:41:10 +0300 |
| commit | b71f3c632355f466ebeb847559593a20383f7ef7 (patch) | |
| tree | 48cbaebfa089eaf478444ba840caa918e9ab0678 | |
| parent | 3f6deecdae3f4265d4f7680a5c9836f349c0527c (diff) | |
[FL-2168] SubGhz: fix auto highlight name when saving RAW (#984)
| -rw-r--r-- | applications/subghz/helpers/subghz_custom_event.h | 1 | ||||
| -rw-r--r-- | applications/subghz/scenes/subghz_scene_read_raw.c | 2 | ||||
| -rw-r--r-- | applications/subghz/scenes/subghz_scene_save_name.c | 12 |
3 files changed, 10 insertions, 5 deletions
diff --git a/applications/subghz/helpers/subghz_custom_event.h b/applications/subghz/helpers/subghz_custom_event.h index 55363c41..5fee3541 100644 --- a/applications/subghz/helpers/subghz_custom_event.h +++ b/applications/subghz/helpers/subghz_custom_event.h @@ -3,6 +3,7 @@ typedef enum { SubghzCustomEventManagerNoSet = 0, SubghzCustomEventManagerSet, + SubghzCustomEventManagerSetRAW, SubghzCustomEventSceneDeleteSuccess = 100, SubghzCustomEventSceneDelete, diff --git a/applications/subghz/scenes/subghz_scene_read_raw.c b/applications/subghz/scenes/subghz_scene_read_raw.c index 170d3c7d..b8659057 100644 --- a/applications/subghz/scenes/subghz_scene_read_raw.c +++ b/applications/subghz/scenes/subghz_scene_read_raw.c @@ -261,7 +261,7 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) { case SubghzCustomEventViewReadRAWSave: if(subghz_scene_read_raw_update_filename(subghz)) { scene_manager_set_scene_state( - subghz->scene_manager, SubGhzSceneReadRAW, SubghzCustomEventManagerSet); + subghz->scene_manager, SubGhzSceneReadRAW, SubghzCustomEventManagerSetRAW); subghz->txrx->rx_key_state = SubGhzRxKeyStateBack; scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaveName); } diff --git a/applications/subghz/scenes/subghz_scene_save_name.c b/applications/subghz/scenes/subghz_scene_save_name.c index ee1df00f..27db3ca6 100644 --- a/applications/subghz/scenes/subghz_scene_save_name.c +++ b/applications/subghz/scenes/subghz_scene_save_name.c @@ -23,9 +23,13 @@ void subghz_scene_save_name_on_enter(void* context) { dev_name_empty = true; } else { strcpy(subghz->file_name_tmp, subghz->file_name); - if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) == - SubghzCustomEventManagerSet) { + if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) != + SubghzCustomEventManagerNoSet) { subghz_get_next_name_file(subghz); + if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) == + SubghzCustomEventManagerSetRAW) { + dev_name_empty = true; + } } } @@ -62,8 +66,8 @@ bool subghz_scene_save_name_on_event(void* context, SceneManagerEvent event) { subghz_save_protocol_to_file(subghz, subghz->file_name); } - if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) == - SubghzCustomEventManagerSet) { + if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) != + SubghzCustomEventManagerNoSet) { subghz_protocol_raw_set_last_file_name( (SubGhzProtocolRAW*)subghz->txrx->protocol_result, subghz->file_name); scene_manager_set_scene_state( |