mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-2603] Infrared: exit app properly if ran from outside the launcher (#1340)

Browse Source 
* Exit app if no previous scene was found
* Infrared: correct return logic for started from archive app

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Georgii Surkov 2022-06-22 18:12:39 +03:00 committed by GitHub
parent 9868a65c15
commit 0b83316560
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
applications/infrared/scenes/infrared_scene_remote.c
View File

@ -79,9 +79,8 @@ bool infrared_scene_remote_on_event(void* context, SceneManagerEvent event) {
if(event.type == SceneManagerEventTypeBack) { if(event.type == SceneManagerEventTypeBack) {
const uint32_t possible_scenes[] = {InfraredSceneRemoteList, InfraredSceneStart}; 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)); scene_manager, possible_scenes, sizeof(possible_scenes) / sizeof(uint32_t));
consumed = true;
} else if(event.type == SceneManagerEventTypeCustom) { } else if(event.type == SceneManagerEventTypeCustom) {
const uint16_t custom_type = infrared_custom_event_get_type(event.event); const uint16_t custom_type = infrared_custom_event_get_type(event.event);
const int16_t button_index = infrared_custom_event_get_value(event.event); const int16_t button_index = infrared_custom_event_get_value(event.event);