From b2ae87ae1f520bfd1cce3f4646b957cdee604ebc Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Fri, 3 May 2024 22:30:30 +0200
Subject: [PATCH] Try to mount WFS drives once even if now USBStorageDevice is
 connected

---
 source/StorageUtils.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/StorageUtils.cpp b/source/StorageUtils.cpp
index 3051322..3839cd1 100644
--- a/source/StorageUtils.cpp
+++ b/source/StorageUtils.cpp
@@ -90,23 +90,21 @@ void initExternalStorage() {
         // the lib before actually using it.
         return;
     }
-    int connectedStorage = 0;
-    if ((connectedStorage = numberUSBStorageDevicesConnected()) <= 0) {
-        nn::spm::Initialize();
-        InitEmptyExternalStorage();
-        nn::spm::Finalize();
-        return;
+    int numConnectedStorage;
+    int maxTries = 1200; // Wait up to 20 seconds, like the Wii U Menu
+    if ((numConnectedStorage = numberUSBStorageDevicesConnected()) <= 0) {
+        maxTries = 1; // Only try once if no USBStorageDrive is connected
+    } else {
+        DEBUG_FUNCTION_LINE("Connected StorageDevices = %d", numConnectedStorage);
     }
 
-    DEBUG_FUNCTION_LINE("Connected StorageDevices = %d", connectedStorage);
-
     nn::spm::Initialize();
 
     nn::spm::StorageListItem items[0x20];
     int tries  = 0;
     bool found = false;
 
-    while (tries < 1200) { // Wait up to 20 seconds, like the Wii U Menu
+    while (tries < maxTries) {
         int32_t numItems = nn::spm::GetStorageList(items, 0x20);
 
         DEBUG_FUNCTION_LINE("Number of items: %d", numItems);
@@ -127,7 +125,7 @@ void initExternalStorage() {
                 }
             }
         }
-        if (found || (connectedStorage == numItems)) {
+        if (found || (numConnectedStorage == numItems)) {
             DEBUG_FUNCTION_LINE("Found all expected items, breaking.");
             break;
         }
@@ -135,7 +133,9 @@ void initExternalStorage() {
         tries++;
     }
     if (!found) {
-        DEBUG_FUNCTION_LINE("USB Storage is connected but either it doesn't have a WFS partition or we ran into a timeout.");
+        if (numConnectedStorage > 0) {
+            DEBUG_FUNCTION_LINE("USB Storage is connected but either it doesn't have a WFS partition or we ran into a timeout.");
+        }
         InitEmptyExternalStorage();
     }