summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@users.noreply.github.com>2020-05-29 00:59:28 +0200
committerGitHub <noreply@github.com>2020-05-29 00:59:28 +0200
commitaad34f3679fa329afd1f3133681ef602a2e57a30 (patch)
tree59886e6b49a8d38afcaebfd555987371fee4ba10
parent07a1052c69a7c7d7feedd878e3371d80c6143981 (diff)
parent0047ca454f9acc2e15a723454b1eac8a18b81904 (diff)
downloadMultiMC-aad34f3679fa329afd1f3133681ef602a2e57a30.tar
MultiMC-aad34f3679fa329afd1f3133681ef602a2e57a30.tar.gz
MultiMC-aad34f3679fa329afd1f3133681ef602a2e57a30.tar.lz
MultiMC-aad34f3679fa329afd1f3133681ef602a2e57a30.tar.xz
MultiMC-aad34f3679fa329afd1f3133681ef602a2e57a30.zip
Merge pull request #3165 from kvverti/wsl-messages
Clarify WSL error messages
-rw-r--r--CMakeLists.txt2
-rw-r--r--application/MultiMC.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11b6b63f..fdc61c06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
if(CMAKE_HOST_SYSTEM_VERSION MATCHES ".*[Mm]icrosoft.*" OR
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()
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp
index 9897d02b..53044c51 100644
--- a/application/MultiMC.cpp
+++ b/application/MultiMC.cpp
@@ -158,8 +158,8 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
) {
showFatalErrorMessage(
"Unsupported system detected!",
- "It seems you are supporting the exploitation of Free Software.\n\n"
- "You smell bad and you should feel bad."
+ "Linux-on-Windows distributions are not supported.\n\n"
+ "Please use the Windows MultiMC binary when playing on Windows."
);
return;
}