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

NOISSUE missed a few places...

Browse Source
This commit is contained in:
Petr Mrázek 2015-10-05 01:53:09 +02:00
parent f93f867c3d
commit 4a900a58d4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
logic/ftb/FTBPlugin.cpp
View File

@ -314,7 +314,7 @@ static QString getLocalCacheStorageLocation()
" If you are on windows, this means your system is broken.";
}
#elif defined(Q_OS_MAC)
ftbDefault = PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher");
ftbDefault = FS::PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher");
#else
ftbDefault = QDir::home().absoluteFilePath(".ftblauncher");
#endif
@ -337,7 +337,7 @@ static QString getRoamingStorageLocation()
qCritical() << "Your APPDATA folder is missing! If you are on windows, this means your system is broken.";
}
#elif defined(Q_OS_MAC)
ftbDefault = PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher");
ftbDefault = FS::PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher");
#else
ftbDefault = QDir::home().absoluteFilePath(".ftblauncher");
#endif

2
logic/java/JavaUtils.cpp
View File

@ -119,7 +119,7 @@ QList<JavaVersionPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
javaVersion->id = subKeyName;
javaVersion->arch = archType;
javaVersion->path =
QDir(PathCombine(value, "bin")).absoluteFilePath("javaw.exe");
QDir(FS::PathCombine(value, "bin")).absoluteFilePath("javaw.exe");
javas.append(javaVersion);
}