Merge branch 'master' into new_vfs_library

Conflicts:
	src/gameinfoimpl.cpp
	src/installationmanager.cpp
	src/mainwindow.cpp
	src/organizercore.cpp
	src/organizercore.h
	src/organizerproxy.cpp
	src/organizerproxy.h
	src/savegamegamebryo.cpp
	src/savegamegamebyro.h
	src/selfupdater.h
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.cpp
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h
	src/spawn.cpp
	src/transfersavesdialog.cpp

1 files changed, 7 insertions, 2 deletions

diff --git a/src/directoryrefresher.cpp b/src/directoryrefresher.cpp
index c253f384..f50a717e 100644
--- a/src/directoryrefresher.cpp
+++ b/src/directoryrefresher.cpp
@@ -18,10 +18,13 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */

 

 #include "directoryrefresher.h"

+

+#include "iplugingame.h"

 #include "utility.h"

 #include "report.h"

 #include "modinfo.h"

-#include <gameinfo.h>

+

+#include <QApplication>

 #include <QDir>

 #include <QString>

 

@@ -141,7 +144,9 @@ void DirectoryRefresher::refresh()
 

   m_DirectoryStructure = new DirectoryEntry(L"data", nullptr, 0);

 

-  std::wstring dataDirectory = GameInfo::instance().getGameDirectory() + L"\\data";

+  IPluginGame const *game = qApp->property("managed_game").value<IPluginGame const *>();

+

+  std::wstring dataDirectory = QDir::toNativeSeparators(game->dataDirectory().absolutePath()).toStdWString();

   m_DirectoryStructure->addFromOrigin(L"data", dataDirectory, 0);

 

   // TODO what was the point of having the priority in this tuple? the list is already sorted by priority