Merge #8777: [qt] WalletModel: Expose disablewallet

6666ca6 [qt] WalletModel: Expose disablewallet (MarcoFalke)

src/qt/bitcoingui.cpp

@@ -77,6 +77,7 @@ const QString BitcoinGUI::DEFAULT_WALLET = "~Default";
 
 BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *networkStyle, QWidget *parent) :
     QMainWindow(parent),
+    enableWallet(false),
     clientModel(0),
     walletFrame(0),
     unitDisplayControl(0),
@@ -122,10 +123,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
 
     QString windowTitle = tr(PACKAGE_NAME) + " - ";
 #ifdef ENABLE_WALLET
-    /* if compiled with wallet support, -disablewallet can still disable the wallet */
+    enableWallet = WalletModel::isWalletEnabled();
-    enableWallet = !GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET);
-#else
-    enableWallet = false;
 #endif // ENABLE_WALLET
     if(enableWallet)
     {

src/qt/walletmodel.cpp

@@ -684,6 +684,11 @@ bool WalletModel::abandonTransaction(uint256 hash) const
     return wallet->AbandonTransaction(hash);
 }
 
+bool WalletModel::isWalletEnabled()
+{
+   return !GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET);
+}
+
 bool WalletModel::hdEnabled() const
 {
     return wallet->IsHDEnabled();

src/qt/walletmodel.h

@@ -203,6 +203,8 @@ public:
     bool transactionCanBeAbandoned(uint256 hash) const;
     bool abandonTransaction(uint256 hash) const;
 
+    static bool isWalletEnabled();
+
     bool hdEnabled() const;
 
 private: