Merge pull request #14509 from poke1024/fix_selection_copy_crash

Fix crash in RichTextLabel::selection_copy()
This commit is contained in:
Rémi Verschelde 2017-12-10 16:17:54 +01:00 committed by GitHub
commit 523237943c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -1822,7 +1822,7 @@ bool RichTextLabel::search(const String &p_string, bool p_from_selection) {
void RichTextLabel::selection_copy() {
if (!selection.enabled)
if (!selection.active || !selection.enabled)
return;
String text;

View file

@ -256,8 +256,8 @@ private:
Item *to;
int to_char;
bool active;
bool enabled;
bool active; // anything selected? i.e. from, to, etc. valid?
bool enabled; // allow selections?
};
Selection selection;