External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-04 09:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem with instance list not using the instance folder path

Browse Source
This commit is contained in:
Petr Mrázek
2013-10-28 20:55:12 +01:00
parent 9233477295
commit 6ecb833dbf
6 changed files with 134 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MultiMC.cpp
View File

@@ -32,8 +32,8 @@ using namespace Util::Commandline;
MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
{
setOrganizationName("MultiMC");
setApplicationName("MultiMC5");
setOrganizationName("MultiMC");
setApplicationName("MultiMC5");
initTranslations();
@@ -139,9 +139,12 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
initGlobalSettings();
// and instances
m_instances.reset(new InstanceList(m_settings->get("InstanceDir").toString(), this));
auto InstDirSetting = m_settings->getSetting("InstanceDir");
m_instances.reset(new InstanceList(InstDirSetting->get().toString(), this));
QLOG_INFO() << "Loading Instances...";
m_instances->loadList();
connect(InstDirSetting, SIGNAL(settingChanged(const Setting &, QVariant)),
m_instances.get(), SLOT(on_InstFolderChanged(const Setting &, QVariant)));
// init the http meta cache
initHttpMetaCache();