Merge branch 'master' into issue/344

# Conflicts:
#	src/gameinfoimpl.cpp
#	src/gameinfoimpl.h
#	src/shared/fallout3info.h
#	src/shared/falloutnvinfo.h
#	src/shared/gameinfo.h
#	src/shared/oblivioninfo.h
#	src/shared/skyriminfo.h

1 files changed, 8 insertions, 4 deletions

diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp
index e7d493a7..7a609374 100644
--- a/src/pluginlist.cpp
+++ b/src/pluginlist.cpp
@@ -24,7 +24,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "scopeguard.h"

 #include "modinfo.h"

 #include <utility.h>

-#include <gameinfo.h>

 #include <iplugingame.h>

 #include <espfile.h>

 #include <report.h>

@@ -128,7 +127,7 @@ void PluginList::refresh(const QString &profileName
   m_ESPsByPriority.clear();

   m_ESPs.clear();

 

-  QStringList primaryPlugins = qApp->property("managed_game").value<IPluginGame*>()->getPrimaryPlugins();

+  QStringList primaryPlugins = m_GamePlugin->getPrimaryPlugins();

 

   m_CurrentProfile = profileName;

 

@@ -313,7 +312,7 @@ bool PluginList::readLoadOrder(const QString &fileName)
 

   int priority = 0;

 

-  QStringList primaryPlugins = qApp->property("managed_game").value<IPluginGame*>()->getPrimaryPlugins();

+  QStringList primaryPlugins = m_GamePlugin->getPrimaryPlugins();

   for (const QString &plugin : primaryPlugins) {

     if (availableESPs.find(plugin) != availableESPs.end()) {

       m_ESPLoadOrder[plugin] = priority++;

@@ -504,7 +503,7 @@ void PluginList::saveTo(const QString &pluginFileName
 

 bool PluginList::saveLoadOrder(DirectoryEntry &directoryStructure)

 {

-  if (GameInfo::instance().getLoadOrderMechanism() != GameInfo::TYPE_FILETIME) {

+  if (m_GamePlugin->getLoadOrderMechanism() != IPluginGame::LoadOrderMechanism::FileTime) {

     // nothing to do

     return true;

   }

@@ -1210,3 +1209,8 @@ PluginList::ESPInfo::ESPInfo(const QString &name, bool enabled,
     m_IsDummy = false;

   }

 }

+

+void PluginList::managedGameChanged(IPluginGame const *gamePlugin)

+{

+  m_GamePlugin = gamePlugin;

+}