Merge remote-tracking branch 'remotes/origin/archive_conflicts_2' into Develop

1 files changed, 3 insertions, 0 deletions

diff --git a/src/organizercore.h b/src/organizercore.h
index 7a62d2c8..68d4e7e4 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -216,6 +216,8 @@ public:
   bool onFinishedRun(const std::function<void (const QString &, unsigned int)> &func);

   void refreshModList(bool saveChanges = true);

   QStringList modsSortedByProfilePriority() const;

+  bool getArchiveParsing() const;

+  void setArchiveParsing(bool archiveParsing);

 

 public: // IPluginDiagnose interface

 

@@ -342,6 +344,7 @@ private:
   bool m_AskForNexusPW;

   bool m_DirectoryUpdate;

   bool m_ArchivesInit;

+  bool m_ArchiveParsing{ m_Settings.archiveParsing() };

 

   MOBase::DelayedFileWriter m_PluginListsWriter;

   UsvfsConnector m_USVFS;