CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1665 put the macOS hint into all of the new fatal error messages.

Browse Source
This commit is contained in:
Petr Mrázek 2017-01-14 16:51:08 +01:00
parent a6ef0059cc
commit fbcbddd4d0
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
application/MultiMC.cpp
View File

@ -82,6 +82,10 @@ static const QLatin1String liveCheckFile("live.check");
using namespace Commandline; using namespace Commandline;
#define MACOS_HINT "If you are on macOS Sierra, you might have to move MultiMC.app to your /Applications or ~/Applications folder. "\
"This usually fixes the problem and you can move the application elsewhere afterwards.\n"
MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv) MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
{ {
#if defined Q_OS_WIN32 #if defined Q_OS_WIN32
@ -204,6 +208,9 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
showFatalErrorMessage( showFatalErrorMessage(
"MultiMC data folder could not be created.", "MultiMC data folder could not be created.",
"MultiMC data folder could not be created.\n" "MultiMC data folder could not be created.\n"
#if defined(Q_OS_MAC)
MACOS_HINT
#endif
"Make sure you have the right permissions to the MultiMC data folder and any folder needed to access it.\n" "Make sure you have the right permissions to the MultiMC data folder and any folder needed to access it.\n"
"\n" "\n"
"MultiMC cannot continue until you fix this problem." "MultiMC cannot continue until you fix this problem."
@ -215,6 +222,9 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
showFatalErrorMessage( showFatalErrorMessage(
"MultiMC data folder could not be opened.", "MultiMC data folder could not be opened.",
"MultiMC data folder could not be opened.\n" "MultiMC data folder could not be opened.\n"
#if defined(Q_OS_MAC)
MACOS_HINT
#endif
"Make sure you have the right permissions to the MultiMC data folder.\n" "Make sure you have the right permissions to the MultiMC data folder.\n"
"\n" "\n"
"MultiMC cannot continue until you fix this problem." "MultiMC cannot continue until you fix this problem."
@ -254,9 +264,10 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
showFatalErrorMessage( showFatalErrorMessage(
"MultiMC data folder is not writable!", "MultiMC data folder is not writable!",
"MultiMC couldn't create a log file - the MultiMC data folder is not writable.\n" "MultiMC couldn't create a log file - the MultiMC data folder is not writable.\n"
"If you are on macOS Sierra, you might have to move MultiMC.app to your /Applications or ~/Applications folder. " #if defined(Q_OS_MAC)
"This usually fixes the problem and you can move the application elsewhere afterwards.\n" MACOS_HINT
"If you are using any other operating system, make sure you have write permissions to the MultiMC data folder.\n" #endif
"Make sure you have write permissions to the MultiMC data folder.\n"
"\n" "\n"
"MultiMC cannot continue until you fix this problem." "MultiMC cannot continue until you fix this problem."
); );