From a029da07b81fec974371739b8352c164f34800a5 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Thu, 3 Aug 2023 03:00:40 +0200
Subject: [PATCH] Misc mass storage fixes

---
 applications/external/mass_storage/mass_storage_app.c          | 2 ++
 applications/external/mass_storage/mass_storage_app_i.h        | 2 +-
 .../external/mass_storage/scenes/mass_storage_scene_start.c    | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/applications/external/mass_storage/mass_storage_app.c b/applications/external/mass_storage/mass_storage_app.c
index 18520fb92..eb10b2928 100644
--- a/applications/external/mass_storage/mass_storage_app.c
+++ b/applications/external/mass_storage/mass_storage_app.c
@@ -61,6 +61,8 @@ MassStorageApp* mass_storage_app_alloc(char* arg) {
 
     view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
 
+    scene_manager_set_scene_state(
+        app->scene_manager, MassStorageSceneStart, MassStorageSceneFileSelect);
     if(storage_file_exists(app->fs_api, furi_string_get_cstr(app->file_path))) {
         scene_manager_next_scene(app->scene_manager, MassStorageSceneWork);
     } else {
diff --git a/applications/external/mass_storage/mass_storage_app_i.h b/applications/external/mass_storage/mass_storage_app_i.h
index 4920a6472..f2ddeaa41 100644
--- a/applications/external/mass_storage/mass_storage_app_i.h
+++ b/applications/external/mass_storage/mass_storage_app_i.h
@@ -26,11 +26,11 @@ struct MassStorageApp {
     NotificationApp* notifications;
     DialogsApp* dialogs;
     Widget* widget;
+    MassStorage* mass_storage_view;
     Submenu* submenu;
 
     FuriString* file_path;
     File* file;
-    MassStorage* mass_storage_view;
 
     FuriMutex* usb_mutex;
     MassStorageUsb* usb;
diff --git a/applications/external/mass_storage/scenes/mass_storage_scene_start.c b/applications/external/mass_storage/scenes/mass_storage_scene_start.c
index df4286f88..15ddb16ec 100644
--- a/applications/external/mass_storage/scenes/mass_storage_scene_start.c
+++ b/applications/external/mass_storage/scenes/mass_storage_scene_start.c
@@ -2,6 +2,7 @@
 
 static void mass_storage_scene_start_submenu_callback(void* context, uint32_t index) {
     MassStorageApp* app = context;
+    scene_manager_set_scene_state(app->scene_manager, MassStorageSceneStart, index);
     scene_manager_next_scene(app->scene_manager, index);
 }
 
@@ -17,6 +18,8 @@ void mass_storage_scene_start_on_enter(void* context) {
         app);
 
     submenu_set_header(submenu, "USB Mass Storage");
+    submenu_set_selected_item(
+        submenu, scene_manager_get_scene_state(app->scene_manager, MassStorageSceneStart));
 
     view_dispatcher_switch_to_view(app->view_dispatcher, MassStorageAppViewSubmenu);
 }