Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-07-27 00:35:59 -04:00
Code Issues Projects Releases Packages Wiki Activity

Continued folder names consolidation & GPS default folder (#2042)

Browse source 
* Continued folder names consolidation

* Clang
This commit is contained in:
Mark Thompson 2024-03-26 11:32:24 -05:00 • committed by GitHub
parent d5c8525afc
commit 264fa9a28e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
firmware/application/ui_external_items_menu_loader.cpp
View file

@ -1,6 +1,7 @@
#include "ui_external_items_menu_loader.hpp"
#include "sd_card.hpp"
#include "file_path.hpp"
namespace ui {
@ -11,8 +12,8 @@ namespace ui {
if (!callback) return;
if (sd_card::status() != sd_card::Status::Mounted)
return;
for (const auto& entry : std::filesystem::directory_iterator(u"APPS", u"*.ppma")) {
auto filePath = u"/APPS/" + entry.path();
for (const auto& entry : std::filesystem::directory_iterator(apps_dir, u"*.ppma")) {
auto filePath = apps_dir / entry.path();
File app;
auto openError = app.open(filePath);
@ -52,8 +53,8 @@ namespace ui {
if (sd_card::status() != sd_card::Status::Mounted)
return external_apps;
for (const auto& entry : std::filesystem::directory_iterator(u"APPS", u"*.ppma")) {
auto filePath = u"/APPS/" + entry.path();
for (const auto& entry : std::filesystem::directory_iterator(apps_dir, u"*.ppma")) {
auto filePath = apps_dir / entry.path();
File app;
auto openError = app.open(filePath);
@ -86,7 +87,7 @@ namespace ui {
gridItem.on_select = [&nav, app_location, filePath]() {
if (!run_external_app(nav, filePath)) {
nav.display_modal("Error", "The .ppma file in your APPS\nfolder can't be read. Please\nupdate your SD Card content.");
nav.display_modal("Error", "The .ppma file in your " + apps_dir.string() + "\nfolder can't be read. Please\nupdate your SD Card content.");
}
};
} else {
@ -95,7 +96,7 @@ namespace ui {
gridItem.bitmap = &bitmap_sd_card_error;
gridItem.on_select = [&nav]() {
nav.display_modal("Error", "The .ppma file in your APPS\nfolder is outdated. Please\nupdate your SD Card content.");
nav.display_modal("Error", "The .ppma file in your " + apps_dir.string() + "\nfolder is outdated. Please\nupdate your SD Card content.");
};
}