summaryrefslogtreecommitdiffstats
path: root/MultiMC.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-10-28 20:55:12 +0100
committerPetr Mrázek <peterix@gmail.com>2013-10-28 20:55:12 +0100
commit6ecb833dbf4c4930c8354dcce7967ad44c16c217 (patch)
tree268120b4b8f7716b6468a655909e1db210dfe3dc /MultiMC.cpp
parent923347729557eed76e4f7e9f6f5f1a79216de0a4 (diff)
downloadMultiMC-6ecb833dbf4c4930c8354dcce7967ad44c16c217.tar
MultiMC-6ecb833dbf4c4930c8354dcce7967ad44c16c217.tar.gz
MultiMC-6ecb833dbf4c4930c8354dcce7967ad44c16c217.tar.lz
MultiMC-6ecb833dbf4c4930c8354dcce7967ad44c16c217.tar.xz
MultiMC-6ecb833dbf4c4930c8354dcce7967ad44c16c217.zip
Fix problem with instance list not using the instance folder path
Diffstat (limited to 'MultiMC.cpp')
-rw-r--r--MultiMC.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp
index 3d62f76e..56109ba6 100644
--- a/MultiMC.cpp
+++ b/MultiMC.cpp
@@ -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();