From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 8 Apr 2015 19:44:21 +0000 (-0400)
Subject: GtkApplication: avoid a crash
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~9924
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c0ac3c3386b555832ad0dc34745ad26dcd184fb4;p=gtk4.git

GtkApplication: avoid a crash

It can apparently happen that we get focus in events
on windows after gtk_application_shutdown() has been
called. Avoid an unnecessary crash in this case.

See
https://bugzilla.redhat.com/show_bug.cgi?id=1176339
---

diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 80658c59c2..91ef3559cf 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -506,7 +506,9 @@ gtk_application_focus_in_event_cb (GtkWindow      *window,
       priv->windows = g_list_concat (link, priv->windows);
     }
 
-  gtk_application_impl_active_window_changed (application->priv->impl, window);
+  if (application->priv->impl)
+    gtk_application_impl_active_window_changed (application->priv->impl, window);
+
   g_object_notify (G_OBJECT (application), "active-window");
 
   return FALSE;