diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-12-19 18:36:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-19 18:36:28 +0100 |
| commit | aaa12e1ddc230135cfe962304fd0eaa870b0c0e4 (patch) | |
| tree | 92a1ff439a0edfbbfc13dfe92d83c44683635da6 /launcher | |
| parent | 2f7fd221af8a44fbdf8f26549c7c715d410d37d8 (diff) | |
| parent | cb67fc1d15048e46212a7158707b0a974b95a6e8 (diff) | |
| download | PrismLauncher-aaa12e1ddc230135cfe962304fd0eaa870b0c0e4.tar.gz PrismLauncher-aaa12e1ddc230135cfe962304fd0eaa870b0c0e4.tar.bz2 PrismLauncher-aaa12e1ddc230135cfe962304fd0eaa870b0c0e4.zip | |
Merge pull request #4354 from ISSOtm/patch-1
Indicate the data folder when related errors occur
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/Application.cpp | 45 |
1 files changed, 27 insertions, 18 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 2d0c81bb..ec6d5984 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -322,14 +322,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; } @@ -337,14 +340,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; } @@ -494,14 +500,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; } |