Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-16 04:24:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Desktop: Fix early animation unload deadlocks

Browse Source
This commit is contained in:
Willy-JL
2024-04-05 21:36:41 +01:00
parent 092f529ed5
commit 5f7e698017
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
applications/services/desktop/scenes/desktop_scene_main.c
View File

@@ -64,21 +64,17 @@ static void
static void desktop_scene_main_open_app_or_profile(Desktop* desktop, FavoriteApp* application) { static void desktop_scene_main_open_app_or_profile(Desktop* desktop, FavoriteApp* application) {
bool load_ok = false; bool load_ok = false;
if(strlen(application->name_or_path) > 0) { if(strlen(application->name_or_path) > 0) {
if(loader_start(desktop->loader, application->name_or_path, NULL, NULL) == loader_start_detached_with_gui_error(desktop->loader, application->name_or_path, NULL);
LoaderStatusOk) { } else {
load_ok = true; loader_start_detached_with_gui_error(desktop->loader, "Passport", NULL);
}
}
if(!load_ok) {
loader_start(desktop->loader, "Passport", NULL, NULL);
} }
} }
static void desktop_scene_main_start_favorite(Desktop* desktop, FavoriteApp* application) { static void desktop_scene_main_start_favorite(Desktop* desktop, FavoriteApp* application) {
if(strlen(application->name_or_path) > 0) { if(strlen(application->name_or_path) > 0) {
loader_start_with_gui_error(desktop->loader, application->name_or_path, NULL); loader_start_detached_with_gui_error(desktop->loader, application->name_or_path);
} else { } else {
loader_start(desktop->loader, LOADER_APPLICATIONS_NAME, NULL, NULL); loader_start_detached_with_gui_error(desktop->loader, LOADER_APPLICATIONS_NAME, NULL);
} }
} }
@@ -141,7 +137,7 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) {
break; break;
case DesktopMainEventOpenPowerOff: { case DesktopMainEventOpenPowerOff: {
loader_start(desktop->loader, "Power", "off", NULL); loader_start_detached_with_gui_error(desktop->loader, "Power", "off");
consumed = true; consumed = true;
break; break;
} }