GUI: Re-work port mapping saving

PIVX-Project · Jun 2, 2021 · 5876841 · 5876841
1 parent fc0452c
commit 5876841
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
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()) {