CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move a good chunk of the singleton objects into a new QApplication subclass.

Browse Source
This commit is contained in:
Petr Mrázek
2013-09-07 04:00:58 +02:00
parent 3f30055afe
commit 6892c11e9f
32 changed files with 491 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
logic/BaseInstance.cpp
View File

@ -18,6 +18,7 @@
#include <QFileInfo>
#include <QDir>
#include <MultiMC.h>
#include "inisettingsobject.h"
#include "setting.h"
@ -52,6 +53,8 @@ BaseInstance::BaseInstance( BaseInstancePrivate* d_in,
settings().registerSetting(new Setting("UseCustomBaseJar", true));
settings().registerSetting(new Setting("CustomBaseJar", ""));
auto globalSettings = MMC->settings();
// Java Settings
settings().registerSetting(new Setting("OverrideJava", false));
settings().registerSetting(new OverrideSetting("JavaPath", globalSettings->getSetting("JavaPath")));