diff --git a/oscar/logger.cpp b/oscar/logger.cpp
index 79b069d1..8c1ade84 100644
--- a/oscar/logger.cpp
+++ b/oscar/logger.cpp
@@ -105,6 +105,7 @@ void LogThread::logToFile()
     }
     logTrigger.wakeAll();
     strlock.unlock();
+
     if (m_logStream) {
         qDebug().noquote() << "Logging to" << debugLog;
     } else {
@@ -112,6 +113,20 @@ void LogThread::logToFile()
     }
 }
 
+LogThread::~LogThread()
+{
+    QMutexLocker lock(&strlock);
+    
+    Q_ASSERT(running == false);
+    if (m_logStream) {
+        delete m_logStream;
+        m_logStream = nullptr;
+        Q_ASSERT(m_logFile);
+        delete m_logFile;
+        m_logFile = nullptr;
+    }
+}
+
 QString LogThread::logFileName()
 {
     if (!m_logFile) {
@@ -124,7 +139,8 @@ void shutdownLogger()
 {
     if (logger) {
         logger->quit();
-        otherThreadPool->waitForDone(-1);
+        // The thread is automatically destroyed when its run() method exits.
+        otherThreadPool->waitForDone(-1);  // wait until that happens
         logger = NULL;
     }
     delete otherThreadPool;
@@ -150,32 +166,23 @@ void LogThread::appendClean(QString msg)
 
 void LogThread::quit() {
     qDebug() << "Shutting down logging thread";
-    running = false;
+    qInstallMessageHandler(0);  // Remove our logger.
+    
     strlock.lock();
-    while (!buffer.isEmpty()) {
-        QString msg = buffer.takeFirst();
-        if (m_logStream) {
-            *m_logStream << msg << endl;
-        }
-    }
-    if (m_logStream) {
-        delete m_logStream;
-        m_logStream = nullptr;
-        Q_ASSERT(m_logFile);
-        delete m_logFile;
-        m_logFile = nullptr;
-    }
-    strlock.unlock();
+    running = false;       // Force the thread to exit after its next iteration.
+    logTrigger.wakeAll();  // Trigger the final flush.
+    strlock.unlock();      // Release the lock so that the thread can complete.
 }
 
 
 void LogThread::run()
 {
+    QMutexLocker lock(&strlock);
+
     running = true;
     s_LoggerRunning.unlock();  // unlock as soon as the thread begins to run
     do {
-        strlock.lock();
-        logTrigger.wait(&strlock);
+        logTrigger.wait(&strlock);  // releases strlock while it waits
         while (connected && m_logFile && !buffer.isEmpty()) {
             QString msg = buffer.takeFirst();
             if (m_logStream) {
@@ -183,8 +190,9 @@ void LogThread::run()
             }
             emit outputLog(msg);
         }
-        strlock.unlock();
     } while (running);
+
+    // strlock will be released when lock goes out of scope
 }
 
 
diff --git a/oscar/logger.h b/oscar/logger.h
index e7ca3584..2f4a1803 100644
--- a/oscar/logger.h
+++ b/oscar/logger.h
@@ -22,7 +22,7 @@ class LogThread:public QObject, public QRunnable
     Q_OBJECT
 public:
     explicit LogThread() : QRunnable() { running = false; logtime.start(); connected = false; m_logFile = nullptr; m_logStream = nullptr; }
-    virtual ~LogThread() {}
+    virtual ~LogThread();
 
     void run();
     void append(QString msg);