TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-04 15:35:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

autostart fix 2 (#2331)

Browse Source
This commit is contained in:
sommermorgentraum 2024-11-02 17:43:42 +08:00 committed by GitHub
parent d5296c6ac3
commit 5bb23b636e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
firmware/application/ui_navigation.cpp
View File

@ -725,20 +725,31 @@ void NavigationView::handle_autostart() {
{{"autostart_app"sv, &autostart_app}}};
if (!autostart_app.empty()) {
bool app_started = false;
// try innerapp
// inner app
if (StartAppByName(autostart_app.c_str())) {
app_started = true;
} else {
// try outside app
auto external_items = ExternalItemsMenuLoader::load_external_items(app_location_t::HOME, *this);
for (const auto& item : external_items) {
if (item.text == autostart_app) {
item.on_select();
app_started = true;
break;
}
return;
}
// lambda
auto execute_app = [=](const std::string& extension) { // TODO: capture ref aka [&] would also lagging th GUI, no idea why
std::string appwithpath = "/" + apps_dir.string() + "/" + autostart_app + extension;
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> conv;
std::filesystem::path pth = conv.from_bytes(appwithpath.c_str());
if (ui::ExternalItemsMenuLoader::run_external_app(*this, pth)) {
return true;
}
return false;
};
// outside app
if (!app_started) {
app_started = execute_app(".ppma");
}
// standalone app
if (!app_started) {
app_started = execute_app(".ppmp");
}
if (!app_started) {