diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-04-15 18:32:46 +0400 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-04-16 16:54:06 +0400 |
| commit | baa23d314d3e80ddb7a6071a8cd10aa425081d74 (patch) | |
| tree | ce269045441f63ae26f0648241e6156fc576c3db /sys/osxvideo | |
| parent | b0b0557c4859f98db62a531b853c157a06c1bcdc (diff) | |
osxvideosink: fix segfault accessing osxwindow when not set yet
Diffstat (limited to 'sys/osxvideo')
| -rw-r--r-- | sys/osxvideo/osxvideosink.m | 7 |
1 files changed, 4 insertions, 3 deletions
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 |