diff options
| author | Skorpionm <85568270+Skorpionm@users.noreply.github.com> | 2022-06-14 06:06:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-14 06:06:36 +0300 |
| commit | adffe20bcbb305a7c8c332c71e59f057f2781546 (patch) | |
| tree | 79a51d6c27a56419162b7bff24b65b167b0f32e2 /applications/subghz/scenes | |
| parent | fb4d4011f45d4f8f8def537b4d31bf944bcc21ea (diff) | |
SubGhz: bugfix 0.60.0 (#1317)
* SubGhz: fix adding one when renaming a file
* SubGhz: fix wrong folder after unsave
* SubGhz: fix syntax
* Github: update codeowners
* Github: fix path selector in codeowners for docker-compose
* Github: add lib owners
Co-authored-by: あく <alleteam@gmail.com>
Diffstat (limited to 'applications/subghz/scenes')
| -rw-r--r-- | applications/subghz/scenes/subghz_scene_read_raw.c | 2 | ||||
| -rw-r--r-- | applications/subghz/scenes/subghz_scene_save_name.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/applications/subghz/scenes/subghz_scene_read_raw.c b/applications/subghz/scenes/subghz_scene_read_raw.c index 97a07140..45bb8a50 100644 --- a/applications/subghz/scenes/subghz_scene_read_raw.c +++ b/applications/subghz/scenes/subghz_scene_read_raw.c @@ -200,8 +200,6 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) { } if((subghz->txrx->txrx_state == SubGhzTxRxStateIDLE) || (subghz->txrx->txrx_state == SubGhzTxRxStateSleep)) { - //ToDo FIX - if(!subghz_tx_start(subghz, subghz->txrx->fff_data)) { scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowOnlyRx); } else { diff --git a/applications/subghz/scenes/subghz_scene_save_name.c b/applications/subghz/scenes/subghz_scene_save_name.c index 95fc1938..272cb681 100644 --- a/applications/subghz/scenes/subghz_scene_save_name.c +++ b/applications/subghz/scenes/subghz_scene_save_name.c @@ -39,12 +39,12 @@ void subghz_scene_save_name_on_enter(void* context) { path_extract_filename(subghz->file_path, file_name, true); if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) != SubGhzCustomEventManagerNoSet) { - subghz_get_next_name_file(subghz, SUBGHZ_MAX_LEN_NAME); - path_extract_filename(subghz->file_path, file_name, true); if(scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) == SubGhzCustomEventManagerSetRAW) { dev_name_empty = true; + subghz_get_next_name_file(subghz, SUBGHZ_MAX_LEN_NAME); } + path_extract_filename(subghz->file_path, file_name, true); } string_set(subghz->file_path, dir_name); } @@ -72,7 +72,11 @@ void subghz_scene_save_name_on_enter(void* context) { bool subghz_scene_save_name_on_event(void* context, SceneManagerEvent event) { SubGhz* subghz = context; if(event.type == SceneManagerEventTypeBack) { - string_set(subghz->file_path, subghz->file_path_tmp); + if(!strcmp(subghz->file_name_tmp, "") || + scene_manager_get_scene_state(subghz->scene_manager, SubGhzSceneReadRAW) != + SubGhzCustomEventManagerNoSet) { + string_set(subghz->file_path, subghz->file_path_tmp); + } scene_manager_previous_scene(subghz->scene_manager); return true; } else if(event.type == SceneManagerEventTypeCustom) { |