summaryrefslogtreecommitdiff
path: root/gtk/gtkapplication.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2015-04-10 08:03:24 -0400
committerMatthias Clasen <mclasen@redhat.com>2015-04-10 08:04:53 -0400
commit7603b527909118f54502e512efcb829e3394a522 (patch)
tree238139e4d2c752906d1a7539550f1171b8536bd4 /gtk/gtkapplication.c
parentefd3758f6a779041ff552cb4c5163446fd951368 (diff)
downloadgtk+-7603b527909118f54502e512efcb829e3394a522.tar.gz
GtkApplication: Prevent more crashes around shutdown
gtk_application_shutdown clears the impl member, so all callbacks, signal handlers, etc that might still be triggered between a shutdown call and the return from the mainloop better be prepared to deal with impl being NULL.
Diffstat (limited to 'gtk/gtkapplication.c')
-rw-r--r--gtk/gtkapplication.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 91ef3559cf..cdc792d633 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -1780,14 +1780,16 @@ void
gtk_application_handle_window_realize (GtkApplication *application,
GtkWindow *window)
{
- gtk_application_impl_handle_window_realize (application->priv->impl, window);
+ if (application->priv->impl)
+ gtk_application_impl_handle_window_realize (application->priv->impl, window);
}
void
gtk_application_handle_window_map (GtkApplication *application,
GtkWindow *window)
{
- gtk_application_impl_handle_window_map (application->priv->impl, window);
+ if (application->priv->impl)
+ gtk_application_impl_handle_window_map (application->priv->impl, window);
}
/**