summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-01-22 00:12:56 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-01-22 00:12:56 +0100
commit14c1d7fef00dbd653dcc21102679575955a694dc (patch)
treed9ccf139e691dc3e3d515c459e25ae707064aed5 /tools
parent23be1d8639898ef887ba819db5c1749caa47e37f (diff)
parent88fd78206051a5c81415ad185432dc811924d08c (diff)
Merge pull request #3408 from neikeq/issue_1123_fix
EditorNode: Ignore unhandled input if there is a dialog visible
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/editor_node.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 3888ed23a6..eae2d69dd9 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -164,7 +164,7 @@ void EditorNode::_update_title() {
void EditorNode::_unhandled_input(const InputEvent& p_event) {
- if (p_event.type==InputEvent::KEY && p_event.key.pressed && !p_event.key.echo) {
+ if (p_event.type==InputEvent::KEY && p_event.key.pressed && !p_event.key.echo && !gui_base->get_viewport()->gui_has_modal_stack()) {
switch(p_event.key.scancode) {