Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-11 06:09:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'UNLEASHED' into 420

Browse Source
This commit is contained in:
RogueMaster
2022-09-29 06:55:36 -04:00
parent 43b62bd2a5 226f8517f3
commit 0adbca80ff
20 changed files with 100 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,7 +209,7 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) {
loader_start(desktop->loader, FLIPPER_APPS[1].name, NULL);
consumed = true;
break;
}
}
case DesktopLockedEventUpdate:
desktop_view_locked_update(desktop->locked_view);
consumed = true;

4
applications/services/gui/modules/file_browser_worker.c
View File

@@ -13,6 +13,7 @@
#define TAG "BrowserWorker"
#define ASSETS_DIR "assets"
#define BADUSB_LAYOUTS_DIR "layouts"
#define BROWSER_ROOT STORAGE_ANY_PATH_PREFIX
#define FILE_NAME_LEN_MAX 256
#define LONG_LOAD_THRESHOLD 100
@@ -78,7 +79,8 @@ static bool browser_filter_by_name(BrowserWorker* browser, string_t name, bool i
if(is_folder) {
// Skip assets folders (if enabled)
if(browser->skip_assets) {
return ((string_cmp_str(name, ASSETS_DIR) == 0) ? (false) : (true));
return ((string_cmp_str(name, ASSETS_DIR) == 0) ? (false) : (true)) &&
((string_cmp_str(name, BADUSB_LAYOUTS_DIR) == 0) ? (false) : (true));
} else {
return true;
}