summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--scene/gui/tree.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/README.md b/README.md
index d5dadb93a7..20d1367762 100644
--- a/README.md
+++ b/README.md
@@ -23,3 +23,5 @@ http://www.godotengine.org
Compilation instructions for every platform can be found in the Wiki:
http://godotengine.org/projects/godot-engine/wiki/Advanced_topics
+
+[![Build Status](https://travis-ci.org/godotengine/godot.svg?branch=master)](https://travis-ci.org/godotengine/godot)
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index 2dffa332ee..3b25701944 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -1730,6 +1730,8 @@ void Tree::_text_editor_modal_close() {
return;
}
+ if (value_editor->has_point(value_editor->get_local_mouse_pos()))
+ return;
text_editor_enter(text_editor->get_text());
}