AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkWindow: Avoid a critical in F10 handling

Browse Source 
The focus widget might be NULL, and we were forgetting to take
that possibility into account in one place.
This commit is contained in:
Matthias Clasen 2014-04-25 22:07:13 -04:00
parent 45735c5b3c
commit 063bd57873
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkwindow.c
View File

@ -11618,9 +11618,12 @@ gtk_window_activate_menubar (GtkWindow *window,
GList *tmp_menubars;
GList *menubars;
GtkMenuShell *menu_shell;
GtkWidget *focus;
focus = gtk_window_get_focus (window);
if (priv->title_box != NULL &&
!gtk_widget_is_ancestor (gtk_window_get_focus (window), priv->title_box) &&
(focus == NULL || !gtk_widget_is_ancestor (focus, priv->title_box)) &&
gtk_widget_child_focus (priv->title_box, GTK_DIR_TAB_FORWARD))
return TRUE;