qt: Do not block GUI thread in RPCConsole

Author: hebasto

src/qt/bitcoin.cpp

@@ -258,6 +258,7 @@ void BitcoinApplication::createWindow(const NetworkStyle *networkStyle)
 {
     window = new BitcoinGUI(node(), platformStyle, networkStyle, nullptr);
     connect(window, &BitcoinGUI::quitClicked, this, &BitcoinApplication::requestShutdown);
+    connect(window, &BitcoinGUI::rpcExecutorThreadFinished, this, &BitcoinApplication::requestNodeShutdown);
 
     pollShutdownTimer = new QTimer(window);
     connect(pollShutdownTimer, &QTimer::timeout, window, &BitcoinGUI::detectShutdown);
@@ -353,8 +354,6 @@ void BitcoinApplication::requestShutdown()
 
     delete clientModel;
     clientModel = nullptr;
-
-    requestNodeShutdown();
 }
 
 void BitcoinApplication::initializeResult(bool success, interfaces::BlockAndHeaderTipInfo tip_info)
@@ -404,7 +403,7 @@ void BitcoinApplication::initializeResult(bool success, interfaces::BlockAndHead
         pollShutdownTimer->start(200);
     } else {
         Q_EMIT splashFinished(); // Make sure splash screen doesn't stick around during shutdown
-        requestShutdown();
+        requestNodeShutdown();
     }
 }
 

src/qt/bitcoingui.cpp

@@ -98,6 +98,8 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
     updateWindowTitle();
 
     rpcConsole = new RPCConsole(node, _platformStyle, nullptr);
+    connect(rpcConsole, &RPCConsole::executorThreadFinished, this, &BitcoinGUI::rpcExecutorThreadFinished);
+
     helpMessageDialog = new HelpMessageDialog(this, false);
 #ifdef ENABLE_WALLET
     if(enableWallet)

src/qt/bitcoingui.h

@@ -212,6 +212,7 @@ class BitcoinGUI : public QMainWindow
 
 Q_SIGNALS:
     void quitClicked();
+    void rpcExecutorThreadFinished();
     /** Signal raised when a URI was entered or dragged to the GUI */
     void receivedURI(const QString &uri);
     /** Signal raised when RPC console shown */

src/qt/rpcconsole.cpp

@@ -707,8 +707,8 @@ void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_
     }
     if (!model) {
         // Client model is being set to 0, this means shutdown() is about to be called.
+        connect(&thread, &QThread::finished, this, &RPCConsole::executorThreadFinished);
         thread.quit();
-        thread.wait();
     }
 }
 

src/qt/rpcconsole.h

@@ -134,6 +134,7 @@ public Q_SLOTS:
 Q_SIGNALS:
     // For RPC command executor
     void cmdRequest(const QString &command, const WalletModel* wallet_model);
+    void executorThreadFinished();
 
 private:
     struct TranslatedStrings {