GUI: Re-work port mapping saving

PIVX-Project · Jun 14, 2021 · fc52bd3 · fc52bd3
1 parent fc0452c
commit fc52bd3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
@@ -15,6 +15,7 @@
 #include "checkpoints.h"
 #include "clientversion.h"
 #include "interfaces/handler.h"
+#include "mapport.h"
 #include "masternodeman.h"
 #include "net.h"
 #include "netbase.h"
@@ -347,6 +348,10 @@ void ClientModel::unsubscribeFromCoreSignals()
     m_handler_notify_block_tip->disconnect();
 }
 
+void ClientModel::mapPort(bool use_upnp, bool use_natpmp) {
+    StartMapPort(use_upnp, use_natpmp);
+}
+
 bool ClientModel::getTorInfo(std::string& ip_port) const
 {
     proxyType onion;

diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
@@ -9,7 +9,6 @@
 
 #include "uint256.h"
 #include "chain.h"
-#include "mapport.h"
 
 #include <QObject>
 #include <QDateTime>
@@ -96,7 +95,8 @@ class ClientModel : public QObject
 
     bool getTorInfo(std::string& ip_port) const;
 
-    static void mapPort(bool use_upnp, bool use_natpmp) { StartMapPort(use_upnp, use_natpmp); }
+    //! Set the automatic port mapping options
+    static void mapPort(bool use_upnp, bool use_natpmp);
 
     // Start/Stop the masternode polling timer
     void startMasternodesTimer();

diff --git a/src/qt/pivx/settings/settingswalletoptionswidget.cpp b/src/qt/pivx/settings/settingswalletoptionswidget.cpp
@@ -60,17 +60,14 @@ SettingsWalletOptionsWidget::SettingsWalletOptionsWidget(PIVXGUI* _window, QWidg
     connect(ui->pushButtonSave, &QPushButton::clicked, [this] { Q_EMIT saveSettings(); });
     connect(ui->pushButtonReset, &QPushButton::clicked, this, &SettingsWalletOptionsWidget::onResetClicked);
     connect(ui->pushButtonClean, &QPushButton::clicked, [this] { Q_EMIT discardSettings(); });
-
-    connect(ui->pushButtonSave, &QPushButton::clicked, [this](){
-        ClientModel::mapPort(ui->mapPortUpnp->isChecked(), ui->mapPortNatpmp->isChecked());
-    });
 }
 
 void SettingsWalletOptionsWidget::onResetClicked()
 {
     QSettings settings;
     walletModel->resetWalletOptions(settings);
     clientModel->getOptionsModel()->setNetworkDefaultOptions(settings, true);
+    saveMapPortOptions();
     inform(tr("Options reset succeed"));
 }
 
@@ -130,6 +127,11 @@ void SettingsWalletOptionsWidget::discardWalletOnlyOptions()
     reloadWalletOptions();
 }
 
+void SettingsWalletOptionsWidget::saveMapPortOptions()
+{
+    clientModel->mapPort(ui->mapPortUpnp->isChecked(), ui->mapPortNatpmp->isChecked());
+}
+
 SettingsWalletOptionsWidget::~SettingsWalletOptionsWidget(){
     delete ui;
 }
diff --git a/src/qt/pivx/settings/settingswalletoptionswidget.h b/src/qt/pivx/settings/settingswalletoptionswidget.h
@@ -25,6 +25,8 @@ class SettingsWalletOptionsWidget : public PWidget
     void discardWalletOnlyOptions();
     bool saveWalletOnlyOptions();
 
+    void saveMapPortOptions();
+
 Q_SIGNALS:
     void saveSettings();
     void discardSettings();

diff --git a/src/qt/pivx/settings/settingswidget.cpp b/src/qt/pivx/settings/settingswidget.cpp
@@ -224,6 +224,9 @@ void SettingsWidget::onSaveOptionsClicked()
         return;
     }
 
+    // Save port mapping settings
+    settingsWalletOptionsWidget->saveMapPortOptions();
+
     if (mapper->submit()) {
         OptionsModel* optionsModel = this->clientModel->getOptionsModel();
         if (optionsModel->isRestartRequired()) {