From d0d795d12d68fcc18ebc1c0aa62544f6379d41ec Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Thu, 11 Jun 2020 12:46:09 +0200
Subject: Fix refresh events of tabs in the right panel when some tabs are
 hidden.

---
 src/mainwindow.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/mainwindow.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 0d2597c7..1c31bce8 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1865,7 +1865,7 @@ void MainWindow::refreshExecutablesList()
 
 void MainWindow::refreshSavesIfOpen()
 {
-  if (ui->tabWidget->currentIndex() == 3) {
+  if (ui->tabWidget->currentIndex() == ui->tabWidget->indexOf(ui->savesTab)) {
     refreshSaveList();
   }
 }
@@ -2276,13 +2276,13 @@ void MainWindow::on_btnRefreshDownloads_clicked()
 
 void MainWindow::on_tabWidget_currentChanged(int index)
 {
-  if (index == 0) {
+  if (index == ui->tabWidget->indexOf(ui->espTab)) {
     m_OrganizerCore.refreshESPList();
-  } else if (index == 1) {
+  } else if (index == ui->tabWidget->indexOf(ui->bsaTab)) {
     m_OrganizerCore.refreshBSAList();
-  } else if (index == 2) {
+  } else if (index == ui->tabWidget->indexOf(ui->dataTab)) {
     m_DataTab->activated();
-  } else if (index == 3) {
+  } else if (index == ui->tabWidget->indexOf(ui->savesTab)) {
     refreshSaveList();
   }
 }
@@ -2495,8 +2495,7 @@ void MainWindow::directory_refreshed()
   // now
   scheduleCheckForProblems();
 
-  //Some better check for the current tab is needed.
-  if (ui->tabWidget->currentIndex() == 2) {
+  if (ui->tabWidget->currentIndex() == ui->tabWidget->indexOf(ui->dataTab)) {
     m_DataTab->updateTree();
   }
 }
-- 
cgit v1.3.1


From bb2dc9bd01fb86f70cd4b84d5169af0fbb363bc7 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Thu, 11 Jun 2020 12:55:59 +0200
Subject: Avoid using indexOf everywhere.

---
 src/mainwindow.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/mainwindow.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 1c31bce8..fef69010 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1865,7 +1865,7 @@ void MainWindow::refreshExecutablesList()
 
 void MainWindow::refreshSavesIfOpen()
 {
-  if (ui->tabWidget->currentIndex() == ui->tabWidget->indexOf(ui->savesTab)) {
+  if (ui->tabWidget->currentWidget() == ui->savesTab) {
     refreshSaveList();
   }
 }
@@ -2276,13 +2276,14 @@ void MainWindow::on_btnRefreshDownloads_clicked()
 
 void MainWindow::on_tabWidget_currentChanged(int index)
 {
-  if (index == ui->tabWidget->indexOf(ui->espTab)) {
+  QWidget* currentWidget = ui->tabWidget->widget(index);
+  if (currentWidget == ui->espTab) {
     m_OrganizerCore.refreshESPList();
-  } else if (index == ui->tabWidget->indexOf(ui->bsaTab)) {
+  } else if (currentWidget == ui->bsaTab) {
     m_OrganizerCore.refreshBSAList();
-  } else if (index == ui->tabWidget->indexOf(ui->dataTab)) {
+  } else if (currentWidget == ui->dataTab) {
     m_DataTab->activated();
-  } else if (index == ui->tabWidget->indexOf(ui->savesTab)) {
+  } else if (currentWidget == ui->savesTab) {
     refreshSaveList();
   }
 }
@@ -2495,7 +2496,7 @@ void MainWindow::directory_refreshed()
   // now
   scheduleCheckForProblems();
 
-  if (ui->tabWidget->currentIndex() == ui->tabWidget->indexOf(ui->dataTab)) {
+  if (ui->tabWidget->currentWidget() == ui->dataTab) {
     m_DataTab->updateTree();
   }
 }
-- 
cgit v1.3.1