From 3cd411d98ac7493eca61f37cb1023a6fd459b5ec Mon Sep 17 00:00:00 2001
From: Willy-JL <willy.leslie@icloud.com>
Date: Mon, 30 Jan 2023 12:14:14 +0000
Subject: [PATCH] Poweroff after setting pin (Fix #118)

---
 .../desktop/scenes/desktop_scene_lock_menu.c  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/applications/services/desktop/scenes/desktop_scene_lock_menu.c b/applications/services/desktop/scenes/desktop_scene_lock_menu.c
index e55fe252e..a0a2c08e9 100644
--- a/applications/services/desktop/scenes/desktop_scene_lock_menu.c
+++ b/applications/services/desktop/scenes/desktop_scene_lock_menu.c
@@ -36,13 +36,21 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) {
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeTick) {
-        bool check_pin_changed =
+        int check_pin_changed =
             scene_manager_get_scene_state(desktop->scene_manager, DesktopSceneLockMenu);
         if(check_pin_changed) {
             DESKTOP_SETTINGS_LOAD(&desktop->settings);
             if(desktop->settings.pin_code.length > 0) {
                 desktop_lock_menu_set_pin_state(desktop->lock_menu, true);
                 scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 0);
+                if(check_pin_changed == 2) {
+                    desktop_pin_lock(&desktop->settings);
+                    desktop_lock(desktop);
+                    Power* power = furi_record_open(RECORD_POWER);
+                    furi_delay_ms(666);
+                    power_off(power);
+                    furi_record_close(RECORD_POWER);
+                }
             }
         }
     } else if(event.type == SceneManagerEventTypeCustom) {
@@ -73,20 +81,20 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) {
             if(desktop->settings.pin_code.length > 0) {
                 desktop_pin_lock(&desktop->settings);
                 desktop_lock(desktop);
+                Power* power = furi_record_open(RECORD_POWER);
+                furi_delay_ms(666);
+                power_off(power);
+                furi_record_close(RECORD_POWER);
             } else {
                 LoaderStatus status =
                     loader_start(desktop->loader, "Desktop", DESKTOP_SETTINGS_RUN_PIN_SETUP_ARG);
                 if(status == LoaderStatusOk) {
-                    scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 1);
+                    scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 2);
                 } else {
                     FURI_LOG_E(TAG, "Unable to start desktop settings");
                 }
             }
             consumed = true;
-            Power* power = furi_record_open(RECORD_POWER);
-            furi_delay_ms(666);
-            power_off(power);
-            furi_record_close(RECORD_POWER);
             break;
 
         case DesktopLockMenuEventXtremeSettings: