0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge https://github.com/robotbrain/MultiMC5 into develop

Browse Source
This commit is contained in:
Petr Mrázek 2014-02-14 20:59:23 +01:00
commit 65e30aa118
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MultiMC.cpp
View File

@ -310,7 +310,7 @@ void MultiMC::initGlobalSettings()
// Updates // Updates
m_settings->registerSetting("UpdateChannel", version().channel); m_settings->registerSetting("UpdateChannel", version().channel);
m_settings->registerSetting("AutoUpdate", true); m_settings->registerSetting("AutoUpdate", true);
// Notifications // Notifications
m_settings->registerSetting("ShownNotifications", QString()); m_settings->registerSetting("ShownNotifications", QString());
@ -319,7 +319,7 @@ void MultiMC::initGlobalSettings()
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
QString ftbDefault = QDir::home().absoluteFilePath(".ftblauncher"); QString ftbDefault = QDir::home().absoluteFilePath(".ftblauncher");
#elif defined(Q_OS_WIN32) #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) #elif defined(Q_OS_MAC)
QString ftbDefault = QString ftbDefault =
PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher"); PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher");