From 43da9c32321aafb29a82e98a06bc0e139bb3864d Mon Sep 17 00:00:00 2001 From: Matt Schatz Date: Sun, 17 Nov 2019 05:06:33 -0700 Subject: [PATCH] Allow options:casemapping to remain defined when using m_nationalchars. --- src/configreader.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/configreader.cpp b/src/configreader.cpp index 782a80080..2a1da8fd8 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -368,7 +368,8 @@ void ServerConfig::Fill() throw CoreException("You must restart to change the server id"); std::string casemapping = options->getString("casemapping"); - if (!casemapping.empty() && casemapping != CaseMapping) + // Ignore this value if CaseMapping is set to something the core doesn't provide (i.e., m_nationalchars). + if (!casemapping.empty() && casemapping != CaseMapping && (CaseMapping == "ascii" || CaseMapping == "rfc1459")) throw CoreException("You must restart to change the server casemapping"); } -- 2.39.2