mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 07:16:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

gtksink: Do not re destroy the GtkWindow if destroyed by the user

Browse source 
Otherwise we will get an ASSERT.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=755249
This commit is contained in:
Thibault Saunier 2015-09-21 10:47:15 +02:00
parent 46e83f5d50
commit 717f922701
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ext/gtk/gstgtkbasesink.c
View file

@ -150,7 +150,12 @@ static void
widget_destroy_cb (GtkWidget * widget, GstGtkBaseSink * gtk_sink) widget_destroy_cb (GtkWidget * widget, GstGtkBaseSink * gtk_sink)
{ {
GST_OBJECT_LOCK (gtk_sink); GST_OBJECT_LOCK (gtk_sink);
g_clear_object (&gtk_sink->widget); if (widget == GTK_WIDGET (gtk_sink->widget))
g_clear_object (&gtk_sink->widget);
else if (widget == gtk_sink->window)
gtk_sink->window = NULL;
else
g_assert_not_reached ();
GST_OBJECT_UNLOCK (gtk_sink); GST_OBJECT_UNLOCK (gtk_sink);
} }
@ -290,6 +295,8 @@ gst_gtk_base_sink_start (GstBaseSink * bsink)
gtk_window_set_default_size (GTK_WINDOW (gst_sink->window), 640, 480); gtk_window_set_default_size (GTK_WINDOW (gst_sink->window), 640, 480);
gtk_window_set_title (GTK_WINDOW (gst_sink->window), klass->window_title); gtk_window_set_title (GTK_WINDOW (gst_sink->window), klass->window_title);
gtk_container_add (GTK_CONTAINER (gst_sink->window), toplevel); gtk_container_add (GTK_CONTAINER (gst_sink->window), toplevel);
g_signal_connect (gst_sink->window, "destroy",
G_CALLBACK (widget_destroy_cb), gst_sink);
gtk_widget_show_all (gst_sink->window); gtk_widget_show_all (gst_sink->window);
} }