vlc/vlc-2.2 | branch: master | Felix Paul Kühne <[email protected]> | Fri 
Jun  5 17:07:34 2015 +0200| [6b065f9721cc4e9a07d19bb68a3c7fdf3d5a6121] | 
committer: Felix Paul Kühne

iOS vout: fix runtime exception (closes #14800)

(cherry picked from commit 1e2a57c3c524e402e6485fbc19f89ec4ed3508cf)

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

 modules/video_output/ios2.m |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
index dfa03e0..da8f5e3 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -135,7 +135,10 @@ static int Open(vlc_object_t *this)
 
     /* get the object we will draw into */
     UIView* viewContainer = var_CreateGetAddress (vd, "drawable-nsobject");
-    if (!viewContainer || ![viewContainer isKindOfClass:[UIView class]])
+    if (!viewContainer)
+        goto bailout;
+
+    if (![viewContainer isKindOfClass:[UIView class]])
         goto bailout;
 
     vout_display_DeleteWindow (vd, NULL);

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to