diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface.c index e6b62d034..a98ca56c5 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface.c @@ -51,18 +51,25 @@ bool xtreme_app_scene_interface_on_event(void* context, SceneManagerEvent event) consumed = true; switch(event.event) { case VarItemListIndexGraphics: + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneInterfaceGraphics, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneInterfaceGraphics); break; case VarItemListIndexMainmenu: + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneInterfaceMainmenu, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneInterfaceMainmenu); break; case VarItemListIndexLockscreen: + scene_manager_set_scene_state( + app->scene_manager, XtremeAppSceneInterfaceLockscreen, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneInterfaceLockscreen); break; case VarItemListIndexStatusbar: + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneInterfaceStatusbar, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneInterfaceStatusbar); break; case VarItemListIndexFileBrowser: + scene_manager_set_scene_state( + app->scene_manager, XtremeAppSceneInterfaceFilebrowser, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneInterfaceFilebrowser); break; default: diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c index 1e5e61fc0..349dd6ee9 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c @@ -68,12 +68,15 @@ bool xtreme_app_scene_misc_on_event(void* context, SceneManagerEvent event) { consumed = true; switch(event.event) { case VarItemListIndexScreen: + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneMiscScreen, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneMiscScreen); break; case VarItemListIndexDolphin: + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneMiscDolphin, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneMiscDolphin); break; case VarItemListIndexChangeDeviceName: + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneMiscRename, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneMiscRename); break; default: diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c index 7118ac385..a761a856e 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c @@ -172,6 +172,7 @@ bool xtreme_app_scene_protocols_on_event(void* context, SceneManagerEvent event) consumed = true; switch(event.event) { case VarItemListIndexSubghzFreqs: + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneProtocolsFreqs, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFreqs); break; default: diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs.c index f8c779cc5..dfe77d26c 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs.c @@ -59,9 +59,13 @@ bool xtreme_app_scene_protocols_freqs_on_event(void* context, SceneManagerEvent consumed = true; switch(event.event) { case VarItemListIndexStaticFreqs: + scene_manager_set_scene_state( + app->scene_manager, XtremeAppSceneProtocolsFreqsStatic, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFreqsStatic); break; case VarItemListIndexHopperFreqs: + scene_manager_set_scene_state( + app->scene_manager, XtremeAppSceneProtocolsFreqsHopper, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFreqsHopper); break; default: diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_start.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_start.c index 1f1c1de70..0129c52a3 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_start.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_start.c @@ -46,12 +46,15 @@ bool xtreme_app_scene_start_on_event(void* context, SceneManagerEvent event) { consumed = true; switch(event.event) { case VarItemListIndexInterface: + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneInterface, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneInterface); break; case VarItemListIndexProtocols: + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneProtocols, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocols); break; case VarItemListIndexMisc: + scene_manager_set_scene_state(app->scene_manager, XtremeAppSceneMisc, 0); scene_manager_next_scene(app->scene_manager, XtremeAppSceneMisc); break; case VarItemListIndexVersion: {