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

[271/906] revert last commit because the crash comes from libselinux

Browse source
This commit is contained in:
Julien Isorce 2008-11-16 16:57:00 +01:00 committed by Tim-Philipp Müller
parent daa5e24b41
commit f878b84f90
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst-libs/gst/gl/gstglwindow_x11.c
View file

@ -490,7 +490,6 @@ gst_gl_window_run_loop (GstGLWindow *window)
while (priv->running) while (priv->running)
{ {
gboolean running = priv->running;
XEvent event; XEvent event;
g_mutex_unlock (priv->x_lock); g_mutex_unlock (priv->x_lock);
@ -519,7 +518,7 @@ gst_gl_window_run_loop (GstGLWindow *window)
if (wm_gl != None && event.xclient.message_type == wm_gl) if (wm_gl != None && event.xclient.message_type == wm_gl)
{ {
if (running) if (priv->running)
{ {
GstGLWindowCB custom_cb = (GstGLWindowCB) event.xclient.data.l[0]; GstGLWindowCB custom_cb = (GstGLWindowCB) event.xclient.data.l[0];
gpointer custom_data = (gpointer) event.xclient.data.l[1]; gpointer custom_data = (gpointer) event.xclient.data.l[1];
@ -541,11 +540,18 @@ gst_gl_window_run_loop (GstGLWindow *window)
g_debug ("Close\n"); g_debug ("Close\n");
running = priv->running = FALSE; priv->running = FALSE;
if (priv->close_cb) if (priv->close_cb)
priv->close_cb (priv->close_data); priv->close_cb (priv->close_data);
priv->draw_cb = NULL;
priv->draw_data = NULL;
priv->resize_cb = NULL;
priv->resize_data = NULL;
priv->close_cb = NULL;
priv->close_data = NULL;
XFlush (priv->device); XFlush (priv->device);
while (XCheckTypedEvent (priv->device, ClientMessage, &event)) while (XCheckTypedEvent (priv->device, ClientMessage, &event))
{ {
@ -563,10 +569,8 @@ gst_gl_window_run_loop (GstGLWindow *window)
case CreateNotify: case CreateNotify:
case ConfigureNotify: case ConfigureNotify:
{ {
gint width = event.xconfigure.width;
gint height = event.xconfigure.height;
if (priv->resize_cb) if (priv->resize_cb)
priv->resize_cb (priv->resize_data, width, height); priv->resize_cb (priv->resize_data, event.xconfigure.width, event.xconfigure.height);
break; break;
} }