summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2014-11-27 18:22:52 -0500
committerMatthias Clasen <mclasen@redhat.com>2014-11-27 18:24:12 -0500
commite26fddc544c76bcc175a8b553525dcfb0daa8f67 (patch)
tree2a2bc1adc2c9e146ebd396cc509bc0f1d300406b
parent8753ef612940d5977bc8af2cca3ceb6cc669d1e4 (diff)
downloadgtk+-e26fddc544c76bcc175a8b553525dcfb0daa8f67.tar.gz
Avoid a critical
gtk_window_get_focus can return NULL, deal with it. https://bugzilla.gnome.org/show_bug.cgi?id=740812
-rw-r--r--gtk/gtkpopover.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 38214c9239..83a8111ebc 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -311,7 +311,7 @@ window_focus_in (GtkWidget *widget,
focus = gtk_window_get_focus (GTK_WINDOW (widget));
- if (!gtk_widget_is_ancestor (focus, GTK_WIDGET (popover)))
+ if (focus == NULL || !gtk_widget_is_ancestor (focus, GTK_WIDGET (popover)))
gtk_widget_grab_focus (GTK_WIDGET (popover));
if (priv->grab_notify_blocked)