1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-21 03:44:05 +00:00

Merge remote-tracking branch 'capostrophic/controlplus'

This commit is contained in:
Marc Zinnschlag 2017-09-11 10:46:34 +02:00
commit 9a8a4c744f

View file

@ -132,7 +132,7 @@ namespace CSMPrefs
if (mods && i == 0) if (mods && i == 0)
{ {
if (mods & Qt::ControlModifier) if (mods & Qt::ControlModifier)
result.append("Ctl+"); result.append("Ctrl+");
if (mods & Qt::ShiftModifier) if (mods & Qt::ShiftModifier)
result.append("Shift+"); result.append("Shift+");
if (mods & Qt::AltModifier) if (mods & Qt::AltModifier)
@ -196,7 +196,7 @@ namespace CSMPrefs
std::string name = value.substr(start, end - start); std::string name = value.substr(start, end - start);
if (name == "Ctl") if (name == "Ctrl")
{ {
mods |= Qt::ControlModifier; mods |= Qt::ControlModifier;
} }