Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev

2026-05-13 12:58:36 -07:00 · 2024-01-05 21:51:29 +00:00
parent 00fbf4a9c7 7eeb60e17e
commit 3041db537e
66 changed files with 166 additions and 76 deletions
--- a/applications/services/desktop/scenes/desktop_scene_locked.c
+++ b/applications/services/desktop/scenes/desktop_scene_locked.c
@@ -92,6 +92,7 @@ bool desktop_scene_locked_on_event(void* context, SceneManagerEvent event) {
            break;
        }
        case DesktopLockedEventUnlocked:
+        case DesktopGlobalApiUnlock:
            desktop_unlock(desktop);
            consumed = true;
            break;
--- a/applications/services/desktop/scenes/desktop_scene_pin_input.c
+++ b/applications/services/desktop/scenes/desktop_scene_pin_input.c
@@ -134,6 +134,7 @@ bool desktop_scene_pin_input_on_event(void* context, SceneManagerEvent event) {
            consumed = true;
            break;
        case DesktopPinInputEventUnlocked:
+        case DesktopGlobalApiUnlock:
            desktop_unlock(desktop);
            consumed = true;
            break;