Avoid writing config on tab change

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 2262a2b34bfb8c1ffb44b78e8e85ad17c692e1c3..a4216074a4780fe3946d2a6fb766ec7e617cd1c4 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -170,9 +170,6 @@ void MainWindow::initStatusBar() {
 void MainWindow::initWidgets() {
     int homeWidget = config()->get(Config::homeWidget).toInt();
     ui->tabHomeWidget->setCurrentIndex(TabsHome(homeWidget));
-    connect(ui->tabHomeWidget, &QTabWidget::currentChanged, [](int index){
-        config()->set(Config::homeWidget, TabsHome(index));
-    });
 
     // [History]
     m_historyWidget = new HistoryWidget(m_ctx, this);
@@ -908,6 +905,8 @@ void MainWindow::closeEvent(QCloseEvent *event) {
     if (!this->cleanedUp) {
         this->cleanedUp = true;
 
+        config()->set(Config::homeWidget, ui->tabHomeWidget->currentIndex());
+
         m_historyWidget->resetModel();
 
         m_updateBytes.stop();

diff --git a/src/MainWindow.h b/src/MainWindow.h
index b8fdfa2f682b5f1b3078b38d3607720273360dee..fd25106dfde9dc1d1d245d481bf287def9773d12 100644 (file)
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -90,8 +90,10 @@ public:
     };
 
     enum TabsHome {
-        CCS,
-        REDDIT
+        CCS = 0,
+        BOUNTIES,
+        REDDIT,
+        REVUO
     };
 
     void showOrHide();

diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
index 6fb4c15e3daeb56dcfd6cb90b9c4585ac0ab5ed8..de9bbe66992fb7b44193e3955573046577242785 100644 (file)
--- a/src/SettingsDialog.cpp
+++ b/src/SettingsDialog.cpp
@@ -6,6 +6,7 @@
 
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QCloseEvent>
 
 #include "Icons.h"
 #include "utils/WebsocketNotifier.h"
@@ -22,9 +23,6 @@ Settings::Settings(QSharedPointer<AppContext> ctx, QWidget *parent)
 
     ui->tabWidget->setTabVisible(5, false);
     ui->tabWidget->setCurrentIndex(config()->get(Config::lastSettingsPage).toInt());
-    connect(ui->tabWidget, &QTabWidget::currentChanged, [](int index){
-            config()->set(Config::lastSettingsPage, index);
-    });
 
     this->setupGeneralTab();
     this->setupPrivacyTab();
@@ -270,4 +268,9 @@ void Settings::enableWebsocket(bool enabled) {
     emit websocketStatusChanged(enabled);
 }
 
+void Settings::closeEvent(QCloseEvent *event) {
+  config()->set(Config::lastSettingsPage, ui->tabWidget->currentIndex());
+  event->accept();
+}
+
 Settings::~Settings() = default;
\ No newline at end of file

diff --git a/src/SettingsDialog.h b/src/SettingsDialog.h
index d6342f8d615f9e39f43cc3588dc92c69b05b0e5b..dacfe6ec43bc4482e06802c78f6cb558840d7726 100644 (file)
--- a/src/SettingsDialog.h
+++ b/src/SettingsDialog.h
@@ -53,6 +53,8 @@ private:
     void setupLocalMoneroFrontendCombobox();
     void enableWebsocket(bool enabled);
 
+    void closeEvent(QCloseEvent *event) override;
+
     QScopedPointer<Ui::Settings> ui;
     QSharedPointer<AppContext> m_ctx;