From 946eb94f0235c873728cd31cad1786184e2b4346 Mon Sep 17 00:00:00 2001
From: TuxSH <1922548+TuxSH@users.noreply.github.com>
Date: Sun, 22 Sep 2024 00:59:57 +0200
Subject: [PATCH] rosalina: clean up code in N3DSMenu_UpdateStatus

---
 sysmodules/rosalina/source/menu.c       | 2 +-
 sysmodules/rosalina/source/menus/n3ds.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sysmodules/rosalina/source/menu.c b/sysmodules/rosalina/source/menu.c
index bde2271d..5811b332 100644
--- a/sysmodules/rosalina/source/menu.c
+++ b/sysmodules/rosalina/source/menu.c
@@ -291,7 +291,7 @@ static void menuInitializeQtm(void)
 
     // Steal QTM handle from GSP, because there is a limit of 3 sessions (or 2 before 9.3) for ALL qtm services
     Handle qtmHandle = 0;
-    for (int i = 0; i < 20 && !qtmIsInitialized(); i++)
+    for (int i = 0; i < 30 && !qtmIsInitialized(); i++)
     {
         if (R_SUCCEEDED(svcControlService(SERVICEOP_STEAL_CLIENT_SESSION, &qtmHandle, "qtm:sp")))
             *qtmGetSessionHandle() = qtmHandle;
diff --git a/sysmodules/rosalina/source/menus/n3ds.c b/sysmodules/rosalina/source/menus/n3ds.c
index d49669be..bf93390d 100644
--- a/sysmodules/rosalina/source/menus/n3ds.c
+++ b/sysmodules/rosalina/source/menus/n3ds.c
@@ -71,15 +71,13 @@ void N3DSMenu_UpdateStatus(void)
 
     if (N3DSMenu_CheckNotN2dsXl())
     {
+        bool blacklisted = false;
+
         // Read status
         if (R_FAILED(QTMS_GetQtmStatus(&lastUpdatedQtmStatus)))
             qtmUnavailableAndNotBlacklisted = true; // stop showing QTM options if unavailable but not blacklisted
 
-        if ((lastUpdatedQtmStatus & 0xFF) == QTM_STATUS_UNAVAILABLE)
-            __builtin_trap();
-
-        bool blacklisted = false;
-        if (lastUpdatedQtmStatus == QTM_STATUS_UNAVAILABLE)
+        else if (lastUpdatedQtmStatus == QTM_STATUS_UNAVAILABLE)
             qtmUnavailableAndNotBlacklisted = R_FAILED(QTMU_IsCurrentAppBlacklisted(&blacklisted)) || !blacklisted;