[FL-2717] Fix unexpected behaviour when opening a remote from outside (#1538)

* Fix unexpected behaviour when opening remote from outside
* Same fix for editing button name
* Exit application correctly if remote was deleted
* Remove duplicate function from ibutton
* Use COUNT_OF macro

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Georgii Surkov
2022-08-05 18:38:20 +03:00
committed by GitHub
parent 55b4ff8e0c
commit d147190d61
10 changed files with 20 additions and 32 deletions

View File

@@ -21,7 +21,10 @@ bool infrared_scene_edit_rename_done_on_event(void* context, SceneManagerEvent e
if(event.type == SceneManagerEventTypeCustom) {
if(event.event == InfraredCustomEventTypePopupClosed) {
scene_manager_next_scene(infrared->scene_manager, InfraredSceneRemote);
if(!scene_manager_search_and_switch_to_previous_scene(
infrared->scene_manager, InfraredSceneRemote)) {
scene_manager_next_scene(infrared->scene_manager, InfraredSceneRemote);
}
consumed = true;
}
}