gui: Fix WalletController deletion

The wallet controller instanced must be deleted after the window instance since it is used there.
stevenroose · Feb 3, 2019 · 60e190c · 60e190c
1 parent 2fbf6a5
commit 60e190c
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -218,6 +218,8 @@ BitcoinApplication::~BitcoinApplication()
 #ifdef ENABLE_WALLET
     delete paymentServer;
     paymentServer = nullptr;
+    delete m_wallet_controller;
+    m_wallet_controller = nullptr;
 #endif
     delete optionsModel;
     optionsModel = nullptr;
@@ -310,10 +312,6 @@ void BitcoinApplication::requestShutdown()
     window->setClientModel(nullptr);
     pollShutdownTimer->stop();
 
-#ifdef ENABLE_WALLET
-    delete m_wallet_controller;
-    m_wallet_controller = nullptr;
-#endif
     delete clientModel;
     clientModel = nullptr;