From baa23d314d3e80ddb7a6071a8cd10aa425081d74 Mon Sep 17 00:00:00 2001 From: Andoni Morales Alastruey Date: Mon, 15 Apr 2013 14:32:46 +0000 Subject: osxvideosink: fix segfault accessing osxwindow when not set yet --- sys/osxvideo/osxvideosink.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sys/osxvideo') diff --git a/sys/osxvideo/osxvideosink.m b/sys/osxvideo/osxvideosink.m index 9de76ff3b..cf939b1b9 100644 --- a/sys/osxvideo/osxvideosink.m +++ b/sys/osxvideo/osxvideosink.m @@ -231,6 +231,7 @@ gst_osx_video_sink_osxwindow_create (GstOSXVideoSink * osxvideosink, gint width, osxwindow->width = width; osxwindow->height = height; osxwindow->closed = FALSE; + osxwindow->internal = FALSE; /* Allocate our GstGLView for the window, and then tell the application * about it (hopefully it's listening...) */ @@ -683,11 +684,11 @@ gst_osx_video_sink_set_window_handle (GstVideoOverlay * overlay, guintptr handle gst_osx_video_sink_call_from_main_thread(osxvideosink, osxvideosink->osxwindow->gstview, @selector(addToSuperview:), osxvideosink->superview, YES); + if (window_id) { + osxvideosink->osxwindow->internal = FALSE; + } } - if (window_id) { - osxvideosink->osxwindow->internal = FALSE; - } } static void -- cgit v1.2.3