From 8d7932467caf70201543d4cebd54fadc1c23f72f Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Mon, 22 May 2023 14:08:36 +0100
Subject: [PATCH] Archive scene fix

---
 applications/main/archive/helpers/archive_browser.c     | 4 +---
 applications/main/archive/scenes/archive_scene_info.c   | 2 +-
 applications/main/archive/scenes/archive_scene_rename.c | 2 +-
 applications/main/archive/scenes/archive_scene_show.c   | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/applications/main/archive/helpers/archive_browser.c b/applications/main/archive/helpers/archive_browser.c
index 8555dca42..bca558fde 100644
--- a/applications/main/archive/helpers/archive_browser.c
+++ b/applications/main/archive/helpers/archive_browser.c
@@ -153,9 +153,7 @@ void archive_update_focus(ArchiveBrowserView* browser, const char* target) {
 
     archive_get_items(browser, furi_string_get_cstr(browser->path));
 
-    if(!archive_file_get_array_size(browser) && archive_is_home(browser)) {
-        archive_switch_tab(browser, TAB_LEFT);
-    } else {
+    if(archive_file_get_array_size(browser) || !archive_is_home(browser)) {
         with_view_model(
             browser->view,
             ArchiveBrowserViewModel * model,
diff --git a/applications/main/archive/scenes/archive_scene_info.c b/applications/main/archive/scenes/archive_scene_info.c
index e1a963d33..07b5aeadb 100644
--- a/applications/main/archive/scenes/archive_scene_info.c
+++ b/applications/main/archive/scenes/archive_scene_info.c
@@ -83,7 +83,7 @@ bool archive_scene_info_on_event(void* context, SceneManagerEvent event) {
     ArchiveApp* app = (ArchiveApp*)context;
 
     if(event.type == SceneManagerEventTypeCustom) {
-        scene_manager_next_scene(app->scene_manager, ArchiveAppSceneBrowser);
+        scene_manager_previous_scene(app->scene_manager);
         return true;
     }
     return false;
diff --git a/applications/main/archive/scenes/archive_scene_rename.c b/applications/main/archive/scenes/archive_scene_rename.c
index 7e68af6cc..81e806a30 100644
--- a/applications/main/archive/scenes/archive_scene_rename.c
+++ b/applications/main/archive/scenes/archive_scene_rename.c
@@ -101,7 +101,7 @@ bool archive_scene_rename_on_event(void* context, SceneManagerEvent event) {
                     archive->dialogs, furi_string_get_cstr(dialog_msg));
                 furi_string_free(dialog_msg);
             }
-            scene_manager_next_scene(archive->scene_manager, ArchiveAppSceneBrowser);
+            scene_manager_previous_scene(archive->scene_manager);
             consumed = true;
         }
     }
diff --git a/applications/main/archive/scenes/archive_scene_show.c b/applications/main/archive/scenes/archive_scene_show.c
index 416c10ded..09e3efa2f 100644
--- a/applications/main/archive/scenes/archive_scene_show.c
+++ b/applications/main/archive/scenes/archive_scene_show.c
@@ -133,7 +133,7 @@ bool archive_scene_show_on_event(void* context, SceneManagerEvent event) {
     ArchiveApp* app = (ArchiveApp*)context;
 
     if(event.type == SceneManagerEventTypeCustom) {
-        scene_manager_next_scene(app->scene_manager, ArchiveAppSceneBrowser);
+        scene_manager_previous_scene(app->scene_manager);
         return true;
     }
     return false;