mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-21 12:29:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

No longer trigger an assert when binding a key to an action that does not exist (closes #2485)

Browse Source
This commit is contained in:
Alexander Bock
2023-02-06 23:17:16 +01:00
parent f7ff2e33da
commit be122a5a73
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/interaction/keybindingmanager.cpp
View File

@@ -55,11 +55,11 @@ void KeybindingManager::keyboardCallback(Key key, KeyModifier modifier, KeyActio
auto ret = _keyLua.equal_range({ key, modifier });
for (auto it = ret.first; it != ret.second; ++it) {
ghoul_assert(!it->second.empty(), "Action must not be empty");
ghoul_assert(
global::actionManager->hasAction(it->second),
"Action must be registered"
);
global::actionManager->triggerAction(it->second, ghoul::Dictionary());
if (!global::actionManager->hasAction(it->second)) {
// Silently ignoring the unknown action as the user might have intended to
// bind a key to multiple actions, only one of which could be defined
global::actionManager->triggerAction(it->second, ghoul::Dictionary());
}
}
}
}