Refactor KeymapManager to enfore setting is_executing on key iteration

Add an iterator based remove to HashMap as that was missing. Make
KeymapManager responsible for throwing on unmap an executing mapping.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/keymap_manager.cc b/src/keymap_manager.cc
index baec1373..81efe7ed 100644
--- a/src/keymap_manager.cc
+++ b/src/keymap_manager.cc
@@ -18,7 +18,12 @@ void KeymapManager::map_key(Key key, KeymapMode mode,
 
 void KeymapManager::unmap_key(Key key, KeymapMode mode)
 {
-    m_mapping.remove(KeyAndMode{key, mode});
+    auto it = m_mapping.find(KeyAndMode{key, mode});
+    if (it == m_mapping.end())
+        return;
+    if (it->value.is_executing)
+        throw runtime_error("cannot unmap key that is currently executing");
+    m_mapping.remove(it);
 }
 
 void KeymapManager::unmap_keys(KeymapMode mode)