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

Merge remote-tracking branch 'origin/dev' into release-candidate

Browse Source
This commit is contained in:
Aleksandr Kutuzov 2022-07-27 02:29:17 +09:00
commit e28446de49
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
applications/nfc/scenes/nfc_scene_mf_classic_menu.c
View File

@ -45,8 +45,7 @@ bool nfc_scene_mf_classic_menu_on_event(void* context, SceneManagerEvent event)
consumed = true; consumed = true;
} }
} else if(event.type == SceneManagerEventTypeBack) { } else if(event.type == SceneManagerEventTypeBack) {
consumed = consumed = scene_manager_previous_scene(nfc->scene_manager);
scene_manager_search_and_switch_to_previous_scene(nfc->scene_manager, NfcSceneStart);
} }
return consumed; return consumed;

3
applications/nfc/scenes/nfc_scene_mf_ultralight_menu.c
View File

@ -49,8 +49,7 @@ bool nfc_scene_mf_ultralight_menu_on_event(void* context, SceneManagerEvent even
consumed = true; consumed = true;
} }
} else if(event.type == SceneManagerEventTypeBack) { } else if(event.type == SceneManagerEventTypeBack) {
consumed = consumed = scene_manager_previous_scene(nfc->scene_manager);
scene_manager_search_and_switch_to_previous_scene(nfc->scene_manager, NfcSceneStart);
} }
return consumed; return consumed;

1
lib/update_util/lfs_backup.c
View File

@ -23,6 +23,7 @@ static void backup_name_converter(string_t filename) {
DESKTOP_SETTINGS_FILE_NAME, DESKTOP_SETTINGS_FILE_NAME,
NOTIFICATION_SETTINGS_FILE_NAME, NOTIFICATION_SETTINGS_FILE_NAME,
SLIDESHOW_FILE_NAME, SLIDESHOW_FILE_NAME,
DOLPHIN_STATE_FILE_NAME,
}; };
for(size_t i = 0; i < COUNT_OF(names); i++) { for(size_t i = 0; i < COUNT_OF(names); i++) {