Remove archive parsing attribute from core and use the one from settings directly.

4 files changed, 5 insertions, 16 deletions

diff --git a/src/filetreemodel.cpp b/src/filetreemodel.cpp
index 7095f492..22bcda28 100644
--- a/src/filetreemodel.cpp
+++ b/src/filetreemodel.cpp
@@ -273,7 +273,7 @@ const FileTreeModel::SortInfo& FileTreeModel::sortInfo() const
 
 bool FileTreeModel::showArchives() const
 {
-  return (m_flags.testFlag(Archives) && m_core.getArchiveParsing());
+  return (m_flags.testFlag(Archives) && m_core.settings().archiveParsing());
 }
 
 QModelIndex FileTreeModel::index(
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f7ff7b04..70432377 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -486,7 +486,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 +2455,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 +2517,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);
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 90771c0a..3d730c23 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -1500,7 +1500,7 @@ IOrganizer const* OrganizerCore::managedGameOrganizer() const
 std::vector<QString> OrganizerCore::enabledArchives()
 {
   std::vector<QString> result;
-  if (m_ArchiveParsing) {
+  if (settings().archiveParsing()) {
     QFile archiveFile(m_CurrentProfile->getArchivesFileName());
     if (archiveFile.open(QIODevice::ReadOnly)) {
       while (!archiveFile.atEnd()) {
diff --git a/src/organizercore.h b/src/organizercore.h
index 905fb111..4ff375b7 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -348,16 +348,6 @@ public:
   boost::signals2::connection onPluginEnabled(std::function<void(const MOBase::IPlugin*)> const& func);

   boost::signals2::connection onPluginDisabled(std::function<void(const MOBase::IPlugin*)> const& func);

 

-  bool getArchiveParsing() const

-  {

-    return m_ArchiveParsing;

-  }

-

-  void setArchiveParsing(bool archiveParsing)

-  {

-    m_ArchiveParsing = archiveParsing;

-  }

-

 public: // IPluginDiagnose interface

 

   virtual std::vector<unsigned int> activeProblems() const;

@@ -505,7 +495,6 @@ private:
 

   bool m_DirectoryUpdate;

   bool m_ArchivesInit;

-  bool m_ArchiveParsing{ m_Settings.archiveParsing() };

 

   MOBase::DelayedFileWriter m_PluginListsWriter;

   UsvfsConnector m_USVFS;