[GUI] Topbar: don't try to poll for data if shutdown was requested.

furszy · furszy · commit 21d56e7e60be · 2021-03-03T13:00:04.000-03:00
diff --git a/src/qt/pivx/topbar.cpp b/src/qt/pivx/topbar.cpp
@@ -443,12 +443,13 @@ void TopBar::setStakingStatusActive(bool fActive)
 }
 void TopBar::updateStakingStatus()
 {
-    setStakingStatusActive(walletModel &&
-                           !walletModel->isWalletLocked() &&
-                           walletModel->isStakingStatusActive());
+    if (walletModel && !walletModel->isShutdownRequested()) {
+        setStakingStatusActive(!walletModel->isWalletLocked() &&
+                               walletModel->isStakingStatusActive());
 
-    // Taking advantage of this timer to update Tor status if needed.
-    updateTorIcon();
+        // Taking advantage of this timer to update Tor status if needed.
+        updateTorIcon();
+    }
 }
 
 void TopBar::setNumConnections(int count)
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -11,6 +11,7 @@
 #include "optionsmodel.h"
 #include "recentrequeststablemodel.h"
 #include "transactiontablemodel.h"
+#include "init.h" // for ShutdownRequested(). Future: move to an interface wrapper
 
 #include "base58.h"
 #include "coincontrol.h"
@@ -67,6 +68,11 @@ bool WalletModel::isRegTestNetwork() const
     return Params().IsRegTestNet();
 }
 
+bool WalletModel::isShutdownRequested()
+{
+    return ShutdownRequested();
+}
+
 bool WalletModel::isColdStakingNetworkelyEnabled() const
 {
     return !sporkManager.IsSporkActive(SPORK_19_COLDSTAKING_MAINTENANCE);
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
@@ -151,6 +151,7 @@ class WalletModel : public QObject
 
     bool isTestNetwork() const;
     bool isRegTestNetwork() const;
+    bool isShutdownRequested();
     /** Whether cold staking is enabled or disabled in the network **/
     bool isColdStakingNetworkelyEnabled() const;
     bool isSaplingInMaintenance() const;

Original file line number	Diff line number	Diff line change
`@@ -443,12 +443,13 @@ void TopBar::setStakingStatusActive(bool fActive)`
`443`	`443`	`}`
`444`	`444`	`void TopBar::updateStakingStatus()`
`445`	`445`	`{`
`446`		`- setStakingStatusActive(walletModel &&`
`447`		`- !walletModel->isWalletLocked() &&`
`448`		`- walletModel->isStakingStatusActive());`
	`446`	`+ if (walletModel && !walletModel->isShutdownRequested()) {`
	`447`	`+ setStakingStatusActive(!walletModel->isWalletLocked() &&`
	`448`	`+ walletModel->isStakingStatusActive());`
`449`	`449`
`450`		`- // Taking advantage of this timer to update Tor status if needed.`
`451`		`- updateTorIcon();`
	`450`	`+ // Taking advantage of this timer to update Tor status if needed.`
	`451`	`+ updateTorIcon();`
	`452`	`+ }`
`452`	`453`	`}`
`453`	`454`
`454`	`455`	`void TopBar::setNumConnections(int count)`