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

Merge pull request #4354 from ISSOtm/patch-1

Browse Source 
Indicate the data folder when related errors occur
This commit is contained in:
Petr Mrázek 2021-12-19 18:36:28 +01:00 committed by GitHub
commit aaa12e1ddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
launcher/Application.cpp
View File

@ -322,14 +322,17 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
{ {
showFatalErrorMessage( showFatalErrorMessage(
"The launcher data folder could not be created.", "The launcher data folder could not be created.",
"The launcher data folder could not be created.\n" QString(
"\n" "The launcher data folder could not be created.\n"
"\n"
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
MACOS_HINT MACOS_HINT
#endif #endif
"Make sure you have the right permissions to the launcher data folder and any folder needed to access it.\n" "Make sure you have the right permissions to the launcher data folder and any folder needed to access it.\n"
"\n" "(%1)\n"
"The launcher cannot continue until you fix this problem." "\n"
"The launcher cannot continue until you fix this problem."
).arg(dataPath);
); );
return; return;
} }
@ -337,14 +340,17 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
{ {
showFatalErrorMessage( showFatalErrorMessage(
"The launcher data folder could not be opened.", "The launcher data folder could not be opened.",
"The launcher data folder could not be opened.\n" QString(
"\n" "The launcher data folder could not be opened.\n"
"\n"
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
MACOS_HINT MACOS_HINT
#endif #endif
"Make sure you have the right permissions to the launcher data folder.\n" "Make sure you have the right permissions to the launcher data folder.\n"
"\n" "(%1)\n"
"The launcher cannot continue until you fix this problem." "\n"
"The launcher cannot continue until you fix this problem."
).arg(dataPath);
); );
return; return;
} }
@ -494,14 +500,17 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
{ {
showFatalErrorMessage( showFatalErrorMessage(
"The launcher data folder is not writable!", "The launcher data folder is not writable!",
"The launcher couldn't create a log file - the data folder is not writable.\n" QString(
"\n" "The launcher couldn't create a log file - the data folder is not writable.\n"
"\n"
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
MACOS_HINT MACOS_HINT
#endif #endif
"Make sure you have write permissions to the data folder.\n" "Make sure you have write permissions to the data folder.\n"
"\n" "(%1)\n"
"The launcher cannot continue until you fix this problem." "\n"
"The launcher cannot continue until you fix this problem."
).arg(dataPath);
); );
return; return;
} }