Merge pull request #11911 from Paulb23/line_edit_caret_resetting_2_1

Fixed caret settings resetting (2.1)
This commit is contained in:
Rémi Verschelde 2017-10-09 14:52:44 +02:00 committed by GitHub
commit 5ac1348523
2 changed files with 2 additions and 2 deletions

View file

@ -543,7 +543,7 @@ void LineEdit::_notification(int p_what) {
switch (p_what) {
#ifdef TOOLS_ENABLED
case NOTIFICATION_ENTER_TREE: {
if (get_tree()->is_editor_hint()) {
if (get_tree()->is_editor_hint() && !get_tree()->is_node_being_edited(this)) {
cursor_set_blink_enabled(EDITOR_DEF("text_editor/caret_blink", false));
cursor_set_blink_speed(EDITOR_DEF("text_editor/caret_blink_speed", 0.65));