diff options
| author | santiagopf <punto@Ariels-Mac-mini.local> | 2015-12-13 02:16:11 -0300 |
|---|---|---|
| committer | santiagopf <punto@Ariels-Mac-mini.local> | 2015-12-13 02:16:11 -0300 |
| commit | 477b174d9de4a199cb59a23881db75ef2f6feecb (patch) | |
| tree | c4225a1fe0dbff09e31e735617369a95fd85e370 /scene/gui/option_button.cpp | |
| parent | 01f063e2fea23a7156e2748e0ac3f950008966cc (diff) | |
| parent | 709de124c17988ab05f606c09d0f6414fbbd2ca9 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene/gui/option_button.cpp')
| -rw-r--r-- | scene/gui/option_button.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp index ff94a37be0..3cc5acc1a6 100644 --- a/scene/gui/option_button.cpp +++ b/scene/gui/option_button.cpp @@ -77,9 +77,14 @@ void OptionButton::_selected(int p_which) { } } - ERR_FAIL_COND(selid==-1); + if (selid==-1 && p_which>=0 && p_which<popup->get_item_count()) { + _select(p_which,true); + } else { - _select(selid,true); + ERR_FAIL_COND(selid==-1); + + _select(selid,true); + } } |