Only shutdown the thread if it's actually running

wiiu-env · Oct 8, 2022 · 1375dbd · 1375dbd
1 parent 0941211
commit 1375dbd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/BackgroundThread.cpp b/src/BackgroundThread.cpp
@@ -14,10 +14,14 @@ BackgroundThread::BackgroundThread() : BackgroundThreadWrapper(BackgroundThread:
 }
 
 BackgroundThread::~BackgroundThread() {
-    DEBUG_FUNCTION_LINE("Shutting down FTP Server");
-    stopThread();
-    while (!hasThreadStopped()) {
-        OSSleepTicks(OSMillisecondsToTicks(10));
+    if (!isThreadTerminated()) {
+        DEBUG_FUNCTION_LINE("Shutting down FTP Server");
+        stopThread();
+        while (!hasThreadStopped()) {
+            OSSleepTicks(OSMillisecondsToTicks(10));
+        }
+    } else {
+        DEBUG_FUNCTION_LINE_WARN("Thread is already terminated");
     }
     if (this->serverSocket >= 0) {
         cleanup_ftp();

diff --git a/src/utils/CThread.h b/src/utils/CThread.h
@@ -89,7 +89,7 @@ class CThread {
     }
 
     //! Check if thread is terminated
-    [[nodiscard]] virtual BOOL isThreadTerminated() const {
+    [[nodiscard]] BOOL isThreadTerminated() const {
         if (pThread) return OSIsThreadTerminated(pThread);
         return false;
     }