mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-22 13:39:40 +00:00
Code Issues Releases Wiki Activity

Use irreflexive, asymmetric comparator as required by the spec.

Browse source
This commit is contained in:
AnyOldName3 2019-03-20 23:32:01 +00:00
parent 3ce261ddd4
commit 32da9a8ab1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/opencs/model/prefs/shortcuteventhandler.cpp
View file

@ -195,7 +195,7 @@ namespace CSMPrefs
// Only activate the best match; in exact conflicts, this will favor the first shortcut added. // Only activate the best match; in exact conflicts, this will favor the first shortcut added.
if (!potentials.empty()) if (!potentials.empty())
{ {
std::sort(potentials.begin(), potentials.end(), ShortcutEventHandler::sort); std::stable_sort(potentials.begin(), potentials.end(), ShortcutEventHandler::sort);
Shortcut* shortcut = potentials.front().second; Shortcut* shortcut = potentials.front().second;
if (shortcut->getModifierStatus() && shortcut->getSecondaryMode() == Shortcut::SM_Replace) if (shortcut->getModifierStatus() && shortcut->getSecondaryMode() == Shortcut::SM_Replace)
@ -325,7 +325,7 @@ namespace CSMPrefs
if (left.first == Matches_WithMod && right.first == Matches_NoMod) if (left.first == Matches_WithMod && right.first == Matches_NoMod)
return true; return true;
else else
return left.second->getPosition() >= right.second->getPosition(); return left.second->getPosition() > right.second->getPosition();
} }
void ShortcutEventHandler::widgetDestroyed() void ShortcutEventHandler::widgetDestroyed()