From 0276dedc6f26e127658a63b63a6e16916f6c34b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Zieli=C5=84ski?= <marcin.zielinski@mudita.com>
Date: Mon, 3 Oct 2022 16:50:21 +0200
Subject: [PATCH] [MOS-753] SIM reinsertion case in SIM Settings

Handling the case when the user during PIN changing
or turning the PIN on/off puts the SIM tray out and
shortly after back in. In such a case, the Settings
application now goes to the 'SIM cards' window
instead of 'PIN settings'.
---
 module-apps/application-settings/ApplicationSettings.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module-apps/application-settings/ApplicationSettings.cpp b/module-apps/application-settings/ApplicationSettings.cpp
index ec0caa2486a7f70c3df9b5c9274211dfa22922f4..41ad72c47872e9e36c527cbee59d387909b857ac 100644
--- a/module-apps/application-settings/ApplicationSettings.cpp
+++ b/module-apps/application-settings/ApplicationSettings.cpp
@@ -589,7 +589,8 @@ namespace app
 
         // despite "import_contacts" has auto-lock prevented, it's included here in previousWindowBackingToSimCards for
         // simplicity
-        if (currentWindowName == phone_lock_window && previousWindowBackingToSimCards) {
+        if ((currentWindowName == phone_lock_window || currentWindowName == sim_unlock_window) &&
+            previousWindowBackingToSimCards) {
             switchWindow(sim_cards);
             return;
         }