diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-05-23 18:41:22 +0200 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-05-23 18:41:22 +0200 |
| commit | e1f542b5b01078f03a25e388c43073574a5eee22 (patch) | |
| tree | 02070e4c177247773184993d9ef27fb5bb91b72f | |
| parent | 15920aa9d0930a4403c4c9673cb7aeff650a8691 (diff) | |
| download | MultiMC-e1f542b5b01078f03a25e388c43073574a5eee22.tar MultiMC-e1f542b5b01078f03a25e388c43073574a5eee22.tar.gz MultiMC-e1f542b5b01078f03a25e388c43073574a5eee22.tar.lz MultiMC-e1f542b5b01078f03a25e388c43073574a5eee22.tar.xz MultiMC-e1f542b5b01078f03a25e388c43073574a5eee22.zip | |
Still trying to fix FTB
| -rw-r--r-- | MultiMC.cpp | 4 | ||||
| -rw-r--r-- | logic/lists/InstanceList.cpp | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp index 4918ba10..c1fc089c 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -398,6 +398,10 @@ void MultiMC::initGlobalSettings() #endif m_settings->registerSetting("FTBLauncherDataRoot", ftbDataDefault); m_settings->registerSetting("FTBLauncherRoot", ftbDefault); + QLOG_INFO() << "FTB Launcher paths:" + << m_settings->get("FTBLauncherDataRoot").toString() + << "and" + << m_settings->get("FTBLauncherRoot").toString(); m_settings->registerSetting("FTBRoot"); if (m_settings->get("FTBRoot").isNull()) diff --git a/logic/lists/InstanceList.cpp b/logic/lists/InstanceList.cpp index 1ff0d2ec..8808d6b5 100644 --- a/logic/lists/InstanceList.cpp +++ b/logic/lists/InstanceList.cpp @@ -296,17 +296,16 @@ void InstanceList::loadGroupList(QMap<QString, QString> &groupMap) QList<FTBRecord> InstanceList::discoverFTBInstances() { QList<FTBRecord> records; - QDir dir = QDir(MMC->settings()->get("FTBLauncherRoot").toString()); + QDir dir = QDir(MMC->settings()->get("FTBLauncherDataRoot").toString()); QDir dataDir = QDir(MMC->settings()->get("FTBRoot").toString()); - if (!dir.exists()) + if (!dataDir.exists()) { - QLOG_INFO() << "The FTB launcher directory specified does not exist. Please check your " - "settings."; + QLOG_INFO() << "The FTB directory specified does not exist. Please check your settings"; return records; } - else if (!dataDir.exists()) + else if (!dir.exists()) { - QLOG_INFO() << "The FTB directory specified does not exist. Please check your settings"; + QLOG_INFO() << "The FTB launcher data directory specified does not exist. Please check your settings"; return records; } dir.cd("ModPacks"); @@ -337,6 +336,7 @@ QList<FTBRecord> InstanceList::discoverFTBInstances() record.instanceDir = dataDir.absoluteFilePath(record.dirName); record.templateDir = dir.absoluteFilePath(record.dirName); QDir test(record.instanceDir); + QLOG_DEBUG() << dataDir.absolutePath() << record.instanceDir << record.dirName; if (!test.exists()) continue; record.name = attrs.value("name").toString(); |