diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-02-01 19:00:19 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-02-01 19:01:06 -0300 |
| commit | b587614653bc9fcd5b11934fc4aca7fe58d5d3a0 (patch) | |
| tree | 65ad352370934a790bd5664adf7f3eaed7d3b845 /scene/gui | |
| parent | cecb37a7a3269338432ec0cf455af355e8af0eb8 (diff) | |
Make sure variant parser recognizes "nil" for compatibility with old engine.cfg style cofig. Closes #3531
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/control.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 71a0f50240..c319e306e0 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -1597,7 +1597,9 @@ bool Control::has_focus() const { void Control::grab_focus() { - ERR_FAIL_COND(!is_inside_tree()); + if (!is_inside_tree()){ + ERR_FAIL_COND(!is_inside_tree()); + } if (data.focus_mode==FOCUS_NONE) return; |