Merge pull request #3165 from kvverti/wsl-messages

Clarify WSL error messages
This commit is contained in:
Petr Mrázek 2020-05-29 00:59:28 +02:00 committed by GitHub
commit aad34f3679
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -9,7 +9,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
if(CMAKE_HOST_SYSTEM_VERSION MATCHES ".*[Mm]icrosoft.*" OR if(CMAKE_HOST_SYSTEM_VERSION MATCHES ".*[Mm]icrosoft.*" OR
CMAKE_HOST_SYSTEM_VERSION MATCHES ".*WSL.*" CMAKE_HOST_SYSTEM_VERSION MATCHES ".*WSL.*"
) )
message(FATAL_ERROR "This is not a supported environment for any purpose and should never be used.") message(FATAL_ERROR "Building MultiMC is not supported in Linux-on-Windows distributions.")
endif() endif()
endif() endif()

View File

@ -158,8 +158,8 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
) { ) {
showFatalErrorMessage( showFatalErrorMessage(
"Unsupported system detected!", "Unsupported system detected!",
"It seems you are supporting the exploitation of Free Software.\n\n" "Linux-on-Windows distributions are not supported.\n\n"
"You smell bad and you should feel bad." "Please use the Windows MultiMC binary when playing on Windows."
); );
return; return;
} }