summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-03-07 19:10:34 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-03-07 19:10:34 +0100
commit84c879b9e90ac733735ca0be68ef795649a0218d (patch)
tree6c5c9df8cd08fbc2890d0f2e0e7dd78e060742c5 /core
parent5eeb46da8da58c88802f89e6f63218c6f9678c70 (diff)
parent9544042adb2818561370e776f93d6ab7cf0033c5 (diff)
Merge pull request #3978 from Hinsbart/fix_erase_event
fix InputMap::action_erase_event()
Diffstat (limited to 'core')
-rw-r--r--core/input_map.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/input_map.cpp b/core/input_map.cpp
index d4560a1e1b..874ce1c424 100644
--- a/core/input_map.cpp
+++ b/core/input_map.cpp
@@ -156,10 +156,7 @@ void InputMap::action_erase_event(const StringName& p_action,const InputEvent& p
List<InputEvent>::Element *E=_find_event(input_map[p_action].inputs,p_event);
if (E)
- return; //already gots
-
- input_map[p_action].inputs.erase(E);
-
+ input_map[p_action].inputs.erase(E);
}