[vlc-commits] vout iOS: prevent termination on close

[Felix Paul Kühne]

vlc/vlc-2.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Jun  9 10:50:51 2015 +0200| [650c0aa103cf5556dec6c008b1cf6ab687e76f8f] | committer: Felix Paul Kühne

vout iOS: prevent termination on close

(cherry picked from commit 91308f0b52e578a2b62bcdc51c9367a73bdef936)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=650c0aa103cf5556dec6c008b1cf6ab687e76f8f
---

 modules/video_output/ios2.m |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
index 06e9a9f..dfa03e0 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -242,8 +242,12 @@ void Close (vlc_object_t *this)
     [sys->glESView performSelectorOnMainThread:@selector(removeFromSuperview) withObject:nil waitUntilDone:NO];
 
     if (sys->gl.sys != NULL) {
-        msg_Dbg(this, "deleting display");
-        vout_display_opengl_Delete(sys->vgl);
+        @synchronized (sys->glESView) {
+            msg_Dbg(this, "deleting display");
+
+            if (likely([sys->glESView isAppActive]))
+                vout_display_opengl_Delete(sys->vgl);
+        }
     }
 
     [sys->glESView release];