From c7f2ac4214af77ab608315d228a657aa0f5f6550 Mon Sep 17 00:00:00 2001
From: Willy-JL <willy.leslie@icloud.com>
Date: Wed, 15 Feb 2023 09:56:35 +0000
Subject: [PATCH] Simpler desktop lock logic

---
 applications/services/desktop/desktop.c                   | 4 +---
 applications/services/desktop/scenes/desktop_scene_main.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 7840cd00a..92ef13659 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -58,10 +58,8 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
         if(!loader_is_locked(desktop->loader)) {
             if(desktop->settings.pin_code.length > 0) {
                 desktop_pin_lock(&desktop->settings);
-                desktop_lock(desktop);
-            } else {
-                desktop_lock(desktop);
             }
+            desktop_lock(desktop);
         }
         return true;
     }
diff --git a/applications/services/desktop/scenes/desktop_scene_main.c b/applications/services/desktop/scenes/desktop_scene_main.c
index d7fc63578..2465a8d2c 100644
--- a/applications/services/desktop/scenes/desktop_scene_main.c
+++ b/applications/services/desktop/scenes/desktop_scene_main.c
@@ -121,11 +121,9 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) {
             if(desktop->settings.pin_code.length > 0) {
                 scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 1);
                 desktop_pin_lock(&desktop->settings);
-                desktop_lock(desktop);
-            } else {
                 scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 0);
-                desktop_lock(desktop);
             }
+            desktop_lock(desktop);
             consumed = true;
             break;