refactor: track "Masternodes" tab show/hide in OptionsModel

Author: kwvg

src/qt/bitcoingui.cpp

@@ -1484,10 +1484,8 @@ void BitcoinGUI::updateGovernanceVisibility()
 
 void BitcoinGUI::updateMasternodesVisibility()
 {
-    const bool fShow = [](){
-        QSettings settings;
-        return settings.value("fShowMasternodesTab").toBool()
-    }();
+    if (!clientModel || !clientModel->getOptionsModel()) return;
+    const bool fShow = clientModel->getOptionsModel()->getShowMasternodesTab();
 
     // Show/hide the underlying QAction, hiding the QToolButton itself doesn't
     // work for the GUI part but is still needed for shortcuts to work properly.

src/qt/optionsmodel.cpp

@@ -344,6 +344,10 @@ bool OptionsModel::Init(bilingual_str& error)
         settings.setValue("fKeepChangeAddress", false);
     fKeepChangeAddress = settings.value("fKeepChangeAddress", false).toBool();
 
+    if (!settings.contains("fShowMasternodesTab"))
+        settings.setValue("fShowMasternodesTab", false);
+    m_enable_masternodes = settings.value("fShowMasternodesTab", false).toBool();
+
     if (!settings.contains("fShowGovernanceTab"))
         settings.setValue("fShowGovernanceTab", false);
     m_enable_governance = settings.value("fShowGovernanceTab", false).toBool();
@@ -656,7 +660,7 @@ QVariant OptionsModel::getOption(OptionID option, const std::string& suffix) con
     case SubFeeFromAmount:
         return m_sub_fee_from_amount;
     case ShowMasternodesTab:
-        return settings.value("fShowMasternodesTab");
+        return m_enable_masternodes;
     case ShowGovernanceTab:
         return m_enable_governance;
     case CoinJoinEnabled:
@@ -842,9 +846,10 @@ bool OptionsModel::setOption(OptionID option, const QVariant& value, const std::
         }
         break;
     case ShowMasternodesTab:
-        if (settings.value("fShowMasternodesTab") != value) {
-            settings.setValue("fShowMasternodesTab", value);
-            Q_EMIT showMasternodesChanged(value.toBool());
+        if (changed()) {
+            m_enable_masternodes = value.toBool();
+            settings.setValue("fShowMasternodesTab", m_enable_masternodes);
+            Q_EMIT showMasternodesChanged();
         }
         break;
     case SubFeeFromAmount:

src/qt/optionsmodel.h

@@ -129,6 +129,7 @@ class OptionsModel : public QAbstractListModel
     bool getSubFeeFromAmount() const { return m_sub_fee_from_amount; }
     bool getEnablePSBTControls() const { return m_enable_psbt_controls; }
     bool getKeepChangeAddress() const { return fKeepChangeAddress; }
+    bool getShowMasternodesTab() const { return m_enable_masternodes; }
     bool getShowGovernanceTab() const { return m_enable_governance; }
     bool getShowAdvancedCJUI() { return fShowAdvancedCJUI; }
     const QString& getOverriddenByCommandLine() { return strOverriddenByCommandLine; }
@@ -159,6 +160,7 @@ class OptionsModel : public QAbstractListModel
     bool m_enable_psbt_controls;
     bool m_mask_values;
     bool fKeepChangeAddress;
+    bool m_enable_masternodes;
     bool m_enable_governance;
     bool fShowAdvancedCJUI;
 
@@ -183,7 +185,7 @@ class OptionsModel : public QAbstractListModel
     void keepChangeAddressChanged(bool);
     void showCoinJoinChanged();
     void showGovernanceChanged();
-    void showMasternodesChanged(bool);
+    void showMasternodesChanged();
     void showTrayIconChanged(bool);
     void fontForMoneyChanged(const QFont&);
 };