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 some differences from OFW

Browse Source
This commit is contained in:
Willy-JL
2024-04-05 01:10:02 +01:00
parent ff88237940
commit edabaf0607
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
#include <applications.h>
#include <storage/storage.h>
#include <furi_hal.h>
#include <momentum/momentum.h>
#include <assets_icons.h>
#include <dialogs/dialogs.h>
#include <toolbox/path.h>
@@ -13,6 +13,8 @@
#include <core/dangerous_defines.h>
#include <gui/icon_i.h>
#include <momentum/momentum.h>
#define TAG "Loader"
#define LOADER_MAGIC_THREAD_VALUE 0xDEADBEEF
@@ -489,7 +491,7 @@ static LoaderStatus loader_start_external_app(
if(load_status != FlipperApplicationLoadStatusSuccess) {
const char* err_msg = flipper_application_load_status_to_string(load_status);
status = loader_make_status_error(
LoaderStatusErrorInternal, error_message, "Load failed %s: %s", path, err_msg);
LoaderStatusErrorInternal, error_message, "Load failed, %s: %s", path, err_msg);
break;
} else if(api_mismatch) {
// Successful map, but found api mismatch -> warn user
@@ -544,12 +546,12 @@ static LoaderStatus loader_start_external_app(
}
loader_start_app_thread(loader, flags);
return status;
} while(0);
flipper_application_free(loader->app.fap);
loader->app.fap = NULL;
if(status != LoaderStatusOk) {
flipper_application_free(loader->app.fap);
loader->app.fap = NULL;
}
return status;
}