From 0b8331656069bbbd011f2dfa0b0c2a03b5d8a859 Mon Sep 17 00:00:00 2001 From: Georgii Surkov <37121527+gsurkov@users.noreply.github.com> Date: Wed, 22 Jun 2022 18:12:39 +0300 Subject: [PATCH] [FL-2603] Infrared: exit app properly if ran from outside the launcher (#1340) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Exit app if no previous scene was found * Infrared: correct return logic for started from archive app Co-authored-by: あく --- applications/infrared/scenes/infrared_scene_remote.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/applications/infrared/scenes/infrared_scene_remote.c b/applications/infrared/scenes/infrared_scene_remote.c index 0b7a1ad9..50f71488 100644 --- a/applications/infrared/scenes/infrared_scene_remote.c +++ b/applications/infrared/scenes/infrared_scene_remote.c @@ -79,9 +79,8 @@ bool infrared_scene_remote_on_event(void* context, SceneManagerEvent event) { if(event.type == SceneManagerEventTypeBack) { const uint32_t possible_scenes[] = {InfraredSceneRemoteList, InfraredSceneStart}; - scene_manager_search_and_switch_to_previous_scene_one_of( + consumed = scene_manager_search_and_switch_to_previous_scene_one_of( scene_manager, possible_scenes, sizeof(possible_scenes) / sizeof(uint32_t)); - consumed = true; } else if(event.type == SceneManagerEventTypeCustom) { const uint16_t custom_type = infrared_custom_event_get_type(event.event); const int16_t button_index = infrared_custom_event_get_value(event.event);