jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-25 16:13:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Server List from JSON (#3165)

Browse source
This commit is contained in:
Zach H 2018-04-09 22:38:21 -04:00 • committed by GitHub
parent 0c10b66a2d
commit 61e509585f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 376 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/shortcutssettings.cpp
View file

@ -150,10 +150,7 @@ bool ShortcutsSettings::isKeyAllowed(QString name, QString Sequences)
<< "Shift+S"
<< "Shift+Left"
<< "Shift+Right");
if (forbiddenKeys.contains(checkSequence)) {
return false;
}
return true;
return !forbiddenKeys.contains(checkSequence);
}
bool ShortcutsSettings::isValid(QString name, QString Sequences)