Merge branch 'master' into disk-cache

This commit is contained in:
ouwou 2020-12-10 02:40:52 -05:00
commit e045452875

View File

@ -77,7 +77,7 @@ void JoinGuildDialog::CheckCode() {
}
bool JoinGuildDialog::IsCode(std::string str) {
return str.length() >= 2 && std::all_of(str.begin(), str.end(), [](char c) -> bool { return std::isalnum(c); });
return str.length() >= 2 && std::all_of(str.begin(), str.end(), [](char c) -> bool { return std::isalnum(c) || c == '-'; });
}
std::string JoinGuildDialog::GetCode() {