aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde2016-09-02 20:31:06 +0200
committerRémi Verschelde2016-09-18 23:03:10 +0200
commit48d1e8bd4e5ebcaf55dc465d9392df0e05405464 (patch)
tree330d764baff0fd2e6bf5cb4527657a350e5b812b
parent73b40d145794eb0371113deae91821d3d75e012f (diff)
downloadgodot-48d1e8bd4e5ebcaf55dc465d9392df0e05405464.tar.gz
godot-48d1e8bd4e5ebcaf55dc465d9392df0e05405464.tar.zst
godot-48d1e8bd4e5ebcaf55dc465d9392df0e05405464.zip
InputEvent: Fix event comparisons when type is NONE
Was a regression from 2e5a4cb5ca33576ea81601f949b2e633ff92213c. Fixes #6376. (cherry picked from commit eff6519aafab0750d10978e9b0b6c51e0fac6862)
-rw-r--r--core/os/input_event.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp
index f4a6de0e9..9d920724e 100644
--- a/core/os/input_event.cpp
+++ b/core/os/input_event.cpp
@@ -39,6 +39,8 @@ bool InputEvent::operator==(const InputEvent &p_event) const {
}
switch(type) {
+ case NONE:
+ return true;
case KEY:
return key.unicode == p_event.key.unicode
&& key.scancode == p_event.key.scancode
@@ -77,6 +79,8 @@ bool InputEvent::operator==(const InputEvent &p_event) const {
case ACTION:
return action.action == p_event.action.action
&& action.pressed == p_event.action.pressed;
+ default:
+ ERR_PRINT("No logic to compare InputEvents of this type, this shouldn't happen.");
}
return false;