Desktop: Fix early animation unload deadlocks

Next-Flip · Apr 5, 2024 · 6aac86a · 6aac86a
1 parent 15e5785
commit 6aac86a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/applications/services/desktop/scenes/desktop_scene_lock_menu.c b/applications/services/desktop/scenes/desktop_scene_lock_menu.c
@@ -91,13 +91,9 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) {
             if(desktop_pin_is_valid(&desktop->settings.pin_code)) {
                 desktop_lock(desktop, true);
             } else {
-                LoaderStatus status = loader_start(
-                    desktop->loader, "Desktop", DESKTOP_SETTINGS_RUN_PIN_SETUP_ARG, NULL);
-                if(status == LoaderStatusOk) {
-                    scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 1);
-                } else {
-                    FURI_LOG_E(TAG, "Unable to start desktop settings");
-                }
+                loader_start_detached_with_gui_error(
+                    desktop->loader, "Destop", DESKTOP_SETTINGS_RUN_PIN_SETUP_ARG);
+                scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 1);
             }
             consumed = true;
             break;
@@ -110,13 +106,9 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) {
                 power_off(power);
                 furi_record_close(RECORD_POWER);
             } else {
-                LoaderStatus status = loader_start(
-                    desktop->loader, "Desktop", DESKTOP_SETTINGS_RUN_PIN_SETUP_ARG, NULL);
-                if(status == LoaderStatusOk) {
-                    scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 2);
-                } else {
-                    FURI_LOG_E(TAG, "Unable to start desktop settings");
-                }
+                loader_start_detached_with_gui_error(
+                    desktop->loader, "Deskop", DESKTOP_SETTINGS_RUN_PIN_SETUP_ARG);
+                scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 2);
             }
             consumed = true;
             break;

diff --git a/applications/services/desktop/scenes/desktop_scene_locked.c b/applications/services/desktop/scenes/desktop_scene_locked.c
@@ -86,7 +86,7 @@ bool desktop_scene_locked_on_event(void* context, SceneManagerEvent event) {
         switch(event.event) {
         case DesktopLockedEventOpenPowerOff: {
             if(momentum_settings.lockscreen_poweroff) {
-                loader_start(desktop->loader, "Power", "off", NULL);
+                loader_start_detached_with_gui_error(desktop->loader, "Power", "off");
             }
             consumed = true;
             break;

diff --git a/applications/services/desktop/scenes/desktop_scene_main.c b/applications/services/desktop/scenes/desktop_scene_main.c
@@ -120,7 +120,7 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) {
             break;
 
         case DesktopMainEventOpenPowerOff: {
-            loader_start(desktop->loader, "Power", "off", NULL);
+            loader_start_detached_with_gui_error(desktop->loader, "Power", "off");
             consumed = true;
             break;
         }