qt: Factor out requestNodeShutdown() slot

bitcoin-core · Sep 27, 2020 · 2ed6cda · 2ed6cda
1 parent b3803a8
commit 2ed6cda
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -335,8 +335,6 @@ void BitcoinApplication::requestShutdown()
     // for example the RPC console may still be executing a command.
     shutdownWindow.reset(ShutdownWindow::showShutdownWindow(window));
 
-    qDebug() << __func__ << ": Requesting shutdown";
-    startThread();
     window->hideAll();
     // Must disconnect node signals otherwise current thread can deadlock since
     // no event loop is running.
@@ -352,8 +350,7 @@ void BitcoinApplication::requestShutdown()
     delete clientModel;
     clientModel = nullptr;
 
-    // Request shutdown from core thread
-    Q_EMIT requestedShutdown();
+    requestNodeShutdown();
 }
 
 void BitcoinApplication::initializeResult(bool success, interfaces::BlockAndHeaderTipInfo tip_info)
@@ -407,6 +404,14 @@ void BitcoinApplication::initializeResult(bool success, interfaces::BlockAndHead
     }
 }
 
+void BitcoinApplication::requestNodeShutdown()
+{
+    qDebug() << __func__ << ": Requesting shutdown";
+    startThread();
+    // Request shutdown from core thread
+    Q_EMIT requestedShutdown();
+}
+
 void BitcoinApplication::shutdownResult()
 {
     quit();

diff --git a/src/qt/bitcoin.h b/src/qt/bitcoin.h
@@ -95,6 +95,7 @@ public Q_SLOTS:
     void initializeResult(bool success, interfaces::BlockAndHeaderTipInfo tip_info);
     /// Request core shutdown
     void requestShutdown();
+    void requestNodeShutdown();
     void shutdownResult();
     /// Handle runaway exceptions. Shows a message box with the problem and quits the program.
     void handleRunawayException(const QString &message);