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

Merge branch 'ul-dev' into xfw-dev

Browse Source
This commit is contained in:
Willy-JL
2023-05-06 01:43:09 +01:00
parent 49df6a89b5
commit 8fa7d16c5f
46 changed files with 1007 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/services/desktop/scenes/desktop_scene_lock_menu.c
View File

@@ -80,7 +80,8 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) {
switch(event.event) {
case DesktopLockMenuEventSettings:
desktop_scene_lock_menu_save_settings(desktop);
loader_show_settings();
loader_show_settings(furi_record_open(RECORD_LOADER));
furi_record_close(RECORD_LOADER);
consumed = true;
break;
case DesktopLockMenuEventLock:

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

@@ -90,10 +90,12 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) {
if(event.type == SceneManagerEventTypeCustom) {
switch(event.event) {
case DesktopMainEventOpenMenu:
loader_show_menu();
case DesktopMainEventOpenMenu: {
Loader* loader = furi_record_open(RECORD_LOADER);
loader_show_menu(loader);
furi_record_close(RECORD_LOADER);
consumed = true;
break;
} break;
case DesktopMainEventOpenLockMenu:
scene_manager_next_scene(desktop->scene_manager, DesktopSceneLockMenu);