asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6717 from Hinsbart/focus_crash

Browse source 
Prevent crash on focus change when no valid next control has been found.
This commit is contained in:
Rémi Verschelde 2016-10-09 14:41:22 +02:00 committed by GitHub
commit 6f9023c9a6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scene/gui/control.cpp
View file

@ -1725,11 +1725,11 @@ Control *Control::find_next_valid_focus() const {
if (next_child==this) // no next control-> if (next_child==this) // no next control->
return (get_focus_mode()==FOCUS_ALL)?next_child:NULL; return (get_focus_mode()==FOCUS_ALL)?next_child:NULL;
if (next_child) {
if (next_child->get_focus_mode()==FOCUS_ALL) if (next_child->get_focus_mode()==FOCUS_ALL)
return next_child; return next_child;
from = next_child;
from = next_child; } else break;
} }
return NULL; return NULL;