From 8715746774b0cb8df8bac34920ffee742d48bf66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 22 May 2015 01:27:59 +0200
Subject: [PATCH] GH-977 this isn't funny anymore...

---
 application/pages/global/MultiMCPage.cpp |  4 ++--
 logic/ftb/FTBPlugin.cpp                  | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp
index 83c1ccd50..7af6b5aa5 100644
--- a/application/pages/global/MultiMCPage.cpp
+++ b/application/pages/global/MultiMCPage.cpp
@@ -301,7 +301,7 @@ void MultiMCPage::applySettings()
 
 	// FTB
 	s->set("TrackFTBInstances", ui->trackFtbBox->isChecked());
-	s->set("FTBLauncherRoot", ui->ftbLauncherBox->text());
+	s->set("FTBLauncherLocal", ui->ftbLauncherBox->text());
 	s->set("FTBRoot", ui->ftbBox->text());
 
 	// Folders
@@ -390,7 +390,7 @@ void MultiMCPage::loadSettings()
 
 	// FTB
 	ui->trackFtbBox->setChecked(s->get("TrackFTBInstances").toBool());
-	ui->ftbLauncherBox->setText(s->get("FTBLauncherRoot").toString());
+	ui->ftbLauncherBox->setText(s->get("FTBLauncherLocal").toString());
 	ui->ftbBox->setText(s->get("FTBRoot").toString());
 
 	// Folders
diff --git a/logic/ftb/FTBPlugin.cpp b/logic/ftb/FTBPlugin.cpp
index 2f294b016..87b9d38a6 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))
 		{