From 8d6a86377b88ffc18fee583098318666ba887bfa Mon Sep 17 00:00:00 2001
From: Jan Hofmeier <jan.hofmeier@gmail.com>
Date: Thu, 2 May 2024 14:23:51 +0200
Subject: [PATCH] still try to mount usb at least once to fix virtual usb

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

diff --git a/source/StorageUtils.cpp b/source/StorageUtils.cpp
index 3051322..4b03503 100644
--- a/source/StorageUtils.cpp
+++ b/source/StorageUtils.cpp
@@ -90,23 +90,17 @@ 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 connectedStorage = numberUSBStorageDevicesConnected();
 
     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
+    for(int tries = 1200; tries; tries--) { // Wait up to 20 seconds, like the Wii U Menu
         int32_t numItems = nn::spm::GetStorageList(items, 0x20);
 
         DEBUG_FUNCTION_LINE("Number of items: %d", numItems);
@@ -127,12 +121,11 @@ void initExternalStorage() {
                 }
             }
         }
-        if (found || (connectedStorage == numItems)) {
+        if (found || (connectedStorage <= numItems)) {
             DEBUG_FUNCTION_LINE("Found all expected items, breaking.");
             break;
         }
         OSSleepTicks(OSMillisecondsToTicks(16));
-        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.");