@@ -79,6 +79,7 @@ Application::Application(int& argc, char** argv)
 
 Application::~Application()
 {
+    qDebug() << "~Application";
     if (m_lockFile) {
         m_lockFile->unlock();
         delete m_lockFile;
 
@@ -1207,6 +1207,7 @@ void MainWindow::closeEvent(QCloseEvent *event) {
     qDebug() << Q_FUNC_INFO;
 
     if (!this->cleanedUp) {
+        qDebug() << "MainWindow: cleaning up";
         this->cleanedUp = true;
 
         emit aboutToQuit();
@@ -1934,5 +1935,5 @@ int MainWindow::findTab(const QString &title) {
 }
 
 MainWindow::~MainWindow() {
-    qDebug() << "~MainWindow";
+    qDebug() << "~MainWindow" << QThread::currentThreadId();
 }
@@ -67,7 +67,7 @@ WindowManager::~WindowManager() {
     qDebug() << "~WindowManager";
     m_cleanupThread->quit();
     m_cleanupThread->wait();
-    qDebug() << "Cleanup thread done";
+    qDebug() << "WindowManager: cleanup thread done" << QThread::currentThreadId();
 }
 
 // ######################## APPLICATION LIFECYCLE ########################
@@ -82,7 +82,7 @@ void WindowManager::quitAfterLastWindow() {
 }
 
 void WindowManager::close() {
-    qDebug() << Q_FUNC_INFO;
+    qDebug() << Q_FUNC_INFO << QThread::currentThreadId();
     for (const auto &window: m_windows) {
         window->close();
     }
@@ -102,12 +102,14 @@ void WindowManager::close() {
 
     torManager()->stop();
 
+    deleteLater();
+
     qDebug() << "Calling QApplication::quit()";
     QApplication::quit();
 }
 
 void WindowManager::closeWindow(MainWindow *window) {
-    qDebug() << "closing Window";
+    qDebug() << "WindowManager: closing Window";
     m_windows.removeOne(window);
 
     // Move Wallet to a different thread for cleanup, so it doesn't block GUI thread
 
@@ -1431,7 +1431,7 @@ void Wallet::getTxPoolStatsAsync() {
 
 Wallet::~Wallet()
 {
-    qDebug("~Wallet: Closing wallet");
+    qDebug() << "~Wallet: Closing wallet" << QThread::currentThreadId();
 
     pauseRefresh();
     m_walletImpl->stop();
@@ -1448,5 +1448,5 @@ Wallet::~Wallet()
 
     delete m_walletImpl;
     m_walletImpl = nullptr;
-    qDebug("m_walletImpl deleted");
+    qDebug() << "m_walletImpl deleted" << QThread::currentThreadId();
 }
@@ -312,6 +312,7 @@ WalletManager::WalletManager(QObject *parent)
 
 WalletManager::~WalletManager()
 {
+    qDebug() << "~WalletManager" << QThread::currentThreadId();
     m_scheduler.shutdownWaitForFinished();
 }
 
 
@@ -10,6 +10,7 @@ FutureScheduler::FutureScheduler(QObject *parent)
 
 FutureScheduler::~FutureScheduler()
 {
+    qDebug() << "~FutureScheduler:" << QThread::currentThreadId();
     shutdownWaitForFinished();
 }
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ Application::Application(int& argc, char** argv)`
`79`	`79`
`80`	`80`	`Application::~Application()`
`81`	`81`	`{`
	`82`	`+ qDebug() << "~Application";`
`82`	`83`	`if (m_lockFile) {`
`83`	`84`	`m_lockFile->unlock();`
`84`	`85`	`delete m_lockFile;`
Original file line number	Diff line number	Diff line change
`@@ -1207,6 +1207,7 @@ void MainWindow::closeEvent(QCloseEvent *event) {`
`1207`	`1207`	`qDebug() << Q_FUNC_INFO;`
`1208`	`1208`
`1209`	`1209`	`if (!this->cleanedUp) {`
	`1210`	`+ qDebug() << "MainWindow: cleaning up";`
`1210`	`1211`	`this->cleanedUp = true;`
`1211`	`1212`
`1212`	`1213`	`emit aboutToQuit();`
`@@ -1934,5 +1935,5 @@ int MainWindow::findTab(const QString &title) {`
`1934`	`1935`	`}`
`1935`	`1936`
`1936`	`1937`	`MainWindow::~MainWindow() {`
`1937`		`- qDebug() << "~MainWindow";`
	`1938`	`+ qDebug() << "~MainWindow" << QThread::currentThreadId();`
`1938`	`1939`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1431,7 +1431,7 @@ void Wallet::getTxPoolStatsAsync() {`
`1431`	`1431`
`1432`	`1432`	`Wallet::~Wallet()`
`1433`	`1433`	`{`
`1434`		`- qDebug("~Wallet: Closing wallet");`
	`1434`	`+ qDebug() << "~Wallet: Closing wallet" << QThread::currentThreadId();`
`1435`	`1435`
`1436`	`1436`	`pauseRefresh();`
`1437`	`1437`	`m_walletImpl->stop();`
`@@ -1448,5 +1448,5 @@ Wallet::~Wallet()`
`1448`	`1448`
`1449`	`1449`	`delete m_walletImpl;`
`1450`	`1450`	`m_walletImpl = nullptr;`
`1451`		`- qDebug("m_walletImpl deleted");`
	`1451`	`+ qDebug() << "m_walletImpl deleted" << QThread::currentThreadId();`
`1452`	`1452`	`}`
Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,7 @@ WalletManager::WalletManager(QObject *parent)`
`312`	`312`
`313`	`313`	`WalletManager::~WalletManager()`
`314`	`314`	`{`
	`315`	`+ qDebug() << "~WalletManager" << QThread::currentThreadId();`
`315`	`316`	`m_scheduler.shutdownWaitForFinished();`
`316`	`317`	`}`
`317`	`318`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ FutureScheduler::FutureScheduler(QObject *parent)`
`10`	`10`
`11`	`11`	`FutureScheduler::~FutureScheduler()`
`12`	`12`	`{`
	`13`	`+ qDebug() << "~FutureScheduler:" << QThread::currentThreadId();`
`13`	`14`	`shutdownWaitForFinished();`
`14`	`15`	`}`
`15`	`16`