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

Loader: Fix event edge cases, fixes Apps hang

Browse Source
This commit is contained in:
Willy-JL
2025-04-15 04:05:52 +01:00
parent 2aba6cc6bf
commit c2dbdb5dd5
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
applications/services/loader/loader.c
View File

@@ -601,7 +601,7 @@ static LoaderMessageLoaderStatusResult loader_start_external_app(
if(res != DialogMessageButtonRight) {
const char* err_msg = flipper_application_preload_status_to_string(preload_res);
result.value = loader_make_status_error(
LoaderStatusErrorAppStarted, // Not LoaderStatusErrorInternal since it would show another popup
LoaderStatusErrorApiMismatchCanceled, // Not LoaderStatusErrorInternal since it would show another popup
error_message,
"Preload failed, %s: %s",
path,
@@ -693,10 +693,6 @@ static LoaderMessageLoaderStatusResult loader_do_start_by_name(
status.value = loader_make_success_status(error_message);
status.error = LoaderStatusErrorUnknown;
LoaderEvent event;
event.type = LoaderEventTypeApplicationBeforeLoad;
furi_pubsub_publish(loader->pubsub, &event);
do {
// check lock
if(loader_do_is_locked(loader)) {
@@ -716,6 +712,17 @@ static LoaderMessageLoaderStatusResult loader_do_start_by_name(
break;
}
// check Applications
if(strcmp(name, LOADER_APPLICATIONS_NAME) == 0) {
loader_do_applications_show(loader);
status.value = loader_make_success_status(error_message);
break;
}
LoaderEvent event;
event.type = LoaderEventTypeApplicationBeforeLoad;
furi_pubsub_publish(loader->pubsub, &event);
// Translate app names (mainly for RPC)
if(!strncmp(name, "Bad USB", strlen("Bad USB"))) {
name = "Bad KB";
@@ -731,13 +738,6 @@ static LoaderMessageLoaderStatusResult loader_do_start_by_name(
}
}
// check Applications
if(strcmp(name, LOADER_APPLICATIONS_NAME) == 0) {
loader_do_applications_show(loader);
status.value = loader_make_success_status(error_message);
break;
}
// check External Applications
{
const char* path = loader_find_external_application_by_name(name);
@@ -930,7 +930,8 @@ int32_t loader_srv(void* p) {
LoaderMessageLoaderStatusResult status = loader_do_start_by_name(
loader, message.start.name, message.start.args, message.start.error_message);
*(message.status_value) = status;
if(status.value != LoaderStatusOk) loader_do_emit_queue_empty_event(loader);
if(status.value != LoaderStatusOk && status.value != LoaderStatusErrorAppStarted)
loader_do_emit_queue_empty_event(loader);
api_lock_unlock(message.api_lock);
break;
}
@@ -939,7 +940,8 @@ int32_t loader_srv(void* p) {
LoaderMessageLoaderStatusResult status = loader_do_start_by_name(
loader, message.start.name, message.start.args, error_message);
loader_show_gui_error(status, message.start.name, error_message);
if(status.value != LoaderStatusOk) loader_do_emit_queue_empty_event(loader);
if(status.value != LoaderStatusOk && status.value != LoaderStatusErrorAppStarted)
loader_do_emit_queue_empty_event(loader);
if(message.start.name) free((void*)message.start.name);
if(message.start.args) free((void*)message.start.args);
furi_string_free(error_message);

1
applications/services/loader/loader.h
View File

@@ -15,6 +15,7 @@ typedef enum {
LoaderStatusErrorAppStarted,
LoaderStatusErrorUnknownApp,
LoaderStatusErrorInternal,
LoaderStatusErrorApiMismatchCanceled, //<! Will bypass GUI error after API mismatch warning was canceled
} LoaderStatus;
typedef enum {

1
applications/services/loader/loader_applications.c
View File

@@ -148,6 +148,7 @@ static void
}
furi_pubsub_unsubscribe(loader_get_pubsub(app->loader), subscription);
furi_thread_flags_clear(APPLICATION_STOP_EVENT);
}
static int32_t loader_applications_thread(void* p) {