callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

application: Protect against double shutdown

Browse Source 
It is not something that can happen normally.
But if it does, we shouldn't crash.

https://bugzilla.gnome.org/show_bug.cgi?id=760680
This commit is contained in:
Matthias Clasen
2016-01-15 17:36:13 -05:00
parent 2b95e4db55
commit 0049be4e58
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkapplication.c
View File

@ -620,8 +620,7 @@ gtk_application_startup (GApplication *g_application)
{ {
GtkApplication *application = GTK_APPLICATION (g_application); GtkApplication *application = GTK_APPLICATION (g_application);
G_APPLICATION_CLASS (gtk_application_parent_class) G_APPLICATION_CLASS (gtk_application_parent_class)->startup (g_application);
->startup (g_application);
gtk_action_muxer_insert (application->priv->muxer, "app", G_ACTION_GROUP (application)); gtk_action_muxer_insert (application->priv->muxer, "app", G_ACTION_GROUP (application));
@ -638,6 +637,9 @@ gtk_application_shutdown (GApplication *g_application)
{ {
GtkApplication *application = GTK_APPLICATION (g_application); GtkApplication *application = GTK_APPLICATION (g_application);
if (application->priv->impl == NULL)
return;
gtk_application_impl_shutdown (application->priv->impl); gtk_application_impl_shutdown (application->priv->impl);
g_clear_object (&application->priv->impl); g_clear_object (&application->priv->impl);
@ -651,8 +653,7 @@ gtk_application_shutdown (GApplication *g_application)
/* Synchronize the recent manager singleton */ /* Synchronize the recent manager singleton */
_gtk_recent_manager_sync (); _gtk_recent_manager_sync ();
G_APPLICATION_CLASS (gtk_application_parent_class) G_APPLICATION_CLASS (gtk_application_parent_class)->shutdown (g_application);
->shutdown (g_application);
} }
static gboolean static gboolean