From 80a7de80783150b6f1aae7a7426ed982b5221d43 Mon Sep 17 00:00:00 2001 From: hedger Date: Tue, 26 Jul 2022 20:13:09 +0300 Subject: [PATCH 1/2] updater: fixed dolphin level not being migrated (#1458) --- lib/update_util/lfs_backup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/update_util/lfs_backup.c b/lib/update_util/lfs_backup.c index b7e7dd89..724da365 100644 --- a/lib/update_util/lfs_backup.c +++ b/lib/update_util/lfs_backup.c @@ -23,6 +23,7 @@ static void backup_name_converter(string_t filename) { DESKTOP_SETTINGS_FILE_NAME, NOTIFICATION_SETTINGS_FILE_NAME, SLIDESHOW_FILE_NAME, + DOLPHIN_STATE_FILE_NAME, }; for(size_t i = 0; i < COUNT_OF(names); i++) { From c7772060657afc8ee5a160ea3ed62246d989c136 Mon Sep 17 00:00:00 2001 From: gornekich Date: Tue, 26 Jul 2022 20:28:37 +0300 Subject: [PATCH 2/2] NFC: fix navigation from menu scenes #1459 --- applications/nfc/scenes/nfc_scene_mf_classic_menu.c | 3 +-- applications/nfc/scenes/nfc_scene_mf_ultralight_menu.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/applications/nfc/scenes/nfc_scene_mf_classic_menu.c b/applications/nfc/scenes/nfc_scene_mf_classic_menu.c index 4942292c..a5370ce7 100644 --- a/applications/nfc/scenes/nfc_scene_mf_classic_menu.c +++ b/applications/nfc/scenes/nfc_scene_mf_classic_menu.c @@ -45,8 +45,7 @@ bool nfc_scene_mf_classic_menu_on_event(void* context, SceneManagerEvent event) consumed = true; } } else if(event.type == SceneManagerEventTypeBack) { - consumed = - scene_manager_search_and_switch_to_previous_scene(nfc->scene_manager, NfcSceneStart); + consumed = scene_manager_previous_scene(nfc->scene_manager); } return consumed; diff --git a/applications/nfc/scenes/nfc_scene_mf_ultralight_menu.c b/applications/nfc/scenes/nfc_scene_mf_ultralight_menu.c index 615c516d..e3d256a5 100644 --- a/applications/nfc/scenes/nfc_scene_mf_ultralight_menu.c +++ b/applications/nfc/scenes/nfc_scene_mf_ultralight_menu.c @@ -49,8 +49,7 @@ bool nfc_scene_mf_ultralight_menu_on_event(void* context, SceneManagerEvent even consumed = true; } } else if(event.type == SceneManagerEventTypeBack) { - consumed = - scene_manager_search_and_switch_to_previous_scene(nfc->scene_manager, NfcSceneStart); + consumed = scene_manager_previous_scene(nfc->scene_manager); } return consumed;