Merge pull request #1360 from Holt59/organizercore-cleaning

OrganizerCore cleaning.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f7ff7b04..c9824a24 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -436,7 +436,6 @@ MainWindow::MainWindow(Settings &settings
   connect(&m_PluginContainer, &PluginContainer::pluginUnregistered, this, &MainWindow::onPluginRegistrationChanged);
 
   connect(&m_OrganizerCore, &OrganizerCore::modInstalled, this, &MainWindow::modInstalled);
-  connect(&m_OrganizerCore, &OrganizerCore::close, this, &QMainWindow::close);
 
   m_CheckBSATimer.setSingleShot(true);
   connect(&m_CheckBSATimer, SIGNAL(timeout()), this, SLOT(checkBSAList()));
@@ -486,7 +485,7 @@ MainWindow::MainWindow(Settings &settings
 
   ui->profileBox->setCurrentText(m_OrganizerCore.currentProfile()->name());
 
-  if (m_OrganizerCore.getArchiveParsing())
+  if (settings.archiveParsing())
   {
     ui->dataTabShowFromArchives->setCheckState(Qt::Checked);
     ui->dataTabShowFromArchives->setEnabled(true);
@@ -2455,6 +2454,7 @@ void MainWindow::on_actionSettings_triggered()
   QString oldProfilesDirectory(settings.paths().profiles());
   QString oldManagedGameDirectory(settings.game().directory().value_or(""));
   bool oldDisplayForeign(settings.interface().displayForeign());
+  bool oldArchiveParsing(settings.archiveParsing());
   bool proxy = settings.network().useProxy();
   DownloadManager *dlManager = m_OrganizerCore.downloadManager();
   const bool oldCheckForUpdates = settings.checkForUpdates();
@@ -2516,9 +2516,8 @@ void MainWindow::on_actionSettings_triggered()
   }
 
   const auto state = settings.archiveParsing();
-  if (state != m_OrganizerCore.getArchiveParsing())
+  if (state != oldArchiveParsing)
   {
-    m_OrganizerCore.setArchiveParsing(state);
     if (!state)
     {
       ui->dataTabShowFromArchives->setCheckState(Qt::Unchecked);