summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-07-17 22:18:53 +0200
committerGitHub <noreply@github.com>2017-07-17 22:18:53 +0200
commit8022c6858997df4190bcc360c3579a0d572ac8fc (patch)
treea0e3b1c6704d896e84d44c26a9983db6f01d7c16
parentb2d2116a3a78dd178ce2735fb1bd3e86b52cb067 (diff)
parent9be034a8cd3d2e71f7075a5200245b43e02444b5 (diff)
Merge pull request #9672 from Noshyaar/pr-lineedit
LineEdit: don't undo uneditable LineEdit
-rw-r--r--scene/gui/line_edit.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 8d3271ca8c..a418444bc5 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -1191,7 +1191,9 @@ void LineEdit::menu_option(int p_option) {
select_all();
} break;
case MENU_UNDO: {
- undo();
+ if (editable) {
+ undo();
+ }
} break;
}
}