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

Prevent crash on focus change when no valid next control has been found.

Browse source 
Fixes the crash discussed in #6714.

(cherry picked from commit 8dd026e4f9)
This commit is contained in:
Andreas Haas 2016-10-05 08:56:58 +02:00 committed by Rémi Verschelde
parent cf427eeb7a
commit 0462bf01a2
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

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