summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-02-14 20:59:23 +0100
committerPetr Mrázek <peterix@gmail.com>2014-02-14 20:59:23 +0100
commit65e30aa1184ab9d1106737fe91f0d58c9c5c3c3e (patch)
tree418c0899b44dcaceb76c57ed6e0868dee2999a05
parenta59dbdcb38a8e64028d2bba82b76499d77c55cc2 (diff)
parent93ee6f90102c0e36f46291a6b0295726cf5c0d28 (diff)
downloadMultiMC-65e30aa1184ab9d1106737fe91f0d58c9c5c3c3e.tar
MultiMC-65e30aa1184ab9d1106737fe91f0d58c9c5c3c3e.tar.gz
MultiMC-65e30aa1184ab9d1106737fe91f0d58c9c5c3c3e.tar.lz
MultiMC-65e30aa1184ab9d1106737fe91f0d58c9c5c3c3e.tar.xz
MultiMC-65e30aa1184ab9d1106737fe91f0d58c9c5c3c3e.zip
Merge https://github.com/robotbrain/MultiMC5 into develop
-rw-r--r--MultiMC.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp
index e4a30f22..598a3a80 100644
--- a/MultiMC.cpp
+++ b/MultiMC.cpp
@@ -310,7 +310,7 @@ void MultiMC::initGlobalSettings()
// Updates
m_settings->registerSetting("UpdateChannel", version().channel);
m_settings->registerSetting("AutoUpdate", true);
-
+
// Notifications
m_settings->registerSetting("ShownNotifications", QString());
@@ -319,7 +319,7 @@ void MultiMC::initGlobalSettings()
#ifdef Q_OS_LINUX
QString ftbDefault = QDir::home().absoluteFilePath(".ftblauncher");
#elif defined(Q_OS_WIN32)
- QString ftbDefault = PathCombine(QDir::homePath(), "AppData/Roaming/ftblauncher");
+ QString ftbDefault = PathCombine(QStandardPaths::writableLocation(QStandardPaths::DataLocation), "/ftblauncher");
#elif defined(Q_OS_MAC)
QString ftbDefault =
PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher");