summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-05-22 01:27:59 +0200
committerPetr Mrázek <peterix@gmail.com>2015-05-22 01:27:59 +0200
commit8715746774b0cb8df8bac34920ffee742d48bf66 (patch)
tree3ca47de2fa1e51d77f2652d0b6b3f9fa9534dcbf /logic
parentcfdfd0e8118fce8525a4618e0ee162f63504ed5b (diff)
downloadMultiMC-8715746774b0cb8df8bac34920ffee742d48bf66.tar
MultiMC-8715746774b0cb8df8bac34920ffee742d48bf66.tar.gz
MultiMC-8715746774b0cb8df8bac34920ffee742d48bf66.tar.lz
MultiMC-8715746774b0cb8df8bac34920ffee742d48bf66.tar.xz
MultiMC-8715746774b0cb8df8bac34920ffee742d48bf66.zip
GH-977 this isn't funny anymore...
Diffstat (limited to 'logic')
-rw-r--r--logic/ftb/FTBPlugin.cpp21
1 files changed, 10 insertions, 11 deletions
diff --git a/logic/ftb/FTBPlugin.cpp b/logic/ftb/FTBPlugin.cpp
index 2f294b01..87b9d38a 100644
--- a/logic/ftb/FTBPlugin.cpp
+++ b/logic/ftb/FTBPlugin.cpp
@@ -35,7 +35,7 @@ inline uint qHash(FTBRecord record)
QSet<FTBRecord> discoverFTBInstances(SettingsObjectPtr globalSettings)
{
QSet<FTBRecord> records;
- QDir dir = QDir(globalSettings->get("FTBLauncherDataRoot").toString());
+ QDir dir = QDir(globalSettings->get("FTBLauncherLocal").toString());
QDir dataDir = QDir(globalSettings->get("FTBRoot").toString());
if (!dataDir.exists())
{
@@ -269,7 +269,7 @@ void FTBPlugin::loadInstances(SettingsObjectPtr globalSettings, QMap<QString, QS
static const int APPDATA_BUFFER_SIZE = 1024;
#endif
-static QString getCacheStorageLocation()
+static QString getLocalCacheStorageLocation()
{
QString ftbDefault;
#ifdef Q_OS_WIN32
@@ -296,7 +296,7 @@ static QString getCacheStorageLocation()
}
-static QString getDynamicStorageLocation()
+static QString getRoamingStorageLocation()
{
QString ftbDefault;
#ifdef Q_OS_WIN32
@@ -322,20 +322,19 @@ void FTBPlugin::initialize(SettingsObjectPtr globalSettings)
{
// FTB
globalSettings->registerSetting("TrackFTBInstances", false);
- QString ftbDataDefault = getDynamicStorageLocation();
- QString ftbDefault = getCacheStorageLocation();
+ QString ftbRoaming = getRoamingStorageLocation();
+ QString ftbLocal = getLocalCacheStorageLocation();
- globalSettings->registerSetting("FTBLauncherDataRoot", ftbDataDefault);
- globalSettings->registerSetting("FTBLauncherRoot", ftbDefault);
- qDebug() << "FTB Launcher paths:" << globalSettings->get("FTBLauncherDataRoot").toString()
- << "and" << globalSettings->get("FTBLauncherRoot").toString();
+ globalSettings->registerSetting("FTBLauncherRoaming", ftbRoaming);
+ globalSettings->registerSetting("FTBLauncherLocal", ftbLocal);
+ qDebug() << "FTB Launcher paths:" << globalSettings->get("FTBLauncherRoaming").toString()
+ << "and" << globalSettings->get("FTBLauncherLocal").toString();
globalSettings->registerSetting("FTBRoot");
if (globalSettings->get("FTBRoot").isNull())
{
QString ftbRoot;
- QFile f(QDir(globalSettings->get("FTBLauncherRoot").toString())
- .absoluteFilePath("ftblaunch.cfg"));
+ QFile f(QDir(globalSettings->get("FTBLauncherRoaming").toString()).absoluteFilePath("ftblaunch.cfg"));
qDebug() << "Attempting to read" << f.fileName();
if (f.open(QFile::ReadOnly))
{