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

Fixes the crash discussed in #6714.
This commit is contained in:
Andreas Haas 2016-10-05 08:56:58 +02:00
parent 1f9e16119f
commit 8dd026e4f9
No known key found for this signature in database
GPG key ID: B5FFAE1B65FBD2E1

View file

@ -1725,11 +1725,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;