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

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Lenny McLennington
2021-12-20 03:01:41 +00:00
parent e6246a9306 3dd6cea8da
commit 18a931eaa9
30 changed files with 435 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
launcher/Application.cpp
View File

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