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, 10 insertions, 4 deletions

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 765858f5..8bc1dbc6 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -18,22 +18,24 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "settingsdialog.h"
+
 #include "ui_settingsdialog.h"
 #include "categoriesdialog.h"
 #include "helper.h"
 #include "noeditdelegate.h"
-#include <gameinfo.h>
+#include "iplugingame.h"
+#include "settings.h"
+
 #include <QDirIterator>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QShortcut>
+
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
-#include "settings.h"
 
 
 using namespace MOBase;
-using namespace MOShared;
 
 
 SettingsDialog::SettingsDialog(QWidget *parent)
@@ -87,7 +89,11 @@ void SettingsDialog::on_categoriesBtn_clicked()
 
 void SettingsDialog::on_bsaDateBtn_clicked()
 {
-  Helper::backdateBSAs(GameInfo::instance().getOrganizerDirectory(), GameInfo::instance().getGameDirectory().append(L"\\data"));
+  IPluginGame const *game = qApp->property("managed_game").value<IPluginGame const *>();
+  QDir dir = game->dataDirectory();
+
+  Helper::backdateBSAs(qApp->property("dataPath").toString().toStdWString(),
+                       dir.absolutePath().toStdWString());
 }
 
 void SettingsDialog::on_browseDownloadDirBtn_clicked()