From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Sun, 17 Jan 2010 21:08:33 +0000 (+0100)
Subject: osx/framework: handle exceptions if there are no SPUs
X-Git-Tag: 1.1.0-ff~1135
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3d87006f1a6a277bafa70f0382ff4c8336ef61d6;p=vlc

osx/framework: handle exceptions if there are no SPUs
---

diff --git a/projects/macosx/framework/Sources/VLCMediaPlayer.m b/projects/macosx/framework/Sources/VLCMediaPlayer.m
index bad64b8d05..51b535eb8b 100644
--- a/projects/macosx/framework/Sources/VLCMediaPlayer.m
+++ b/projects/macosx/framework/Sources/VLCMediaPlayer.m
@@ -288,12 +288,21 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
     libvlc_exception_t ex;
     libvlc_exception_init( &ex );
     NSInteger count = libvlc_video_get_spu_count( instance, &ex );
-    catch_exception( &ex );
+    if (libvlc_exception_raised( &ex ))
+    {
+        libvlc_exception_clear( &ex );
+        return NSNotFound;
+    }
     if (count <= 0)
         return NSNotFound;
     NSUInteger result = libvlc_video_get_spu( instance, &ex );
-    catch_exception( &ex );
-    return result;
+    if (libvlc_exception_raised( &ex ))
+    {
+        libvlc_exception_clear( &ex );
+        return NSNotFound;
+    }
+    else
+        return result;
 }
 
 - (BOOL)openVideoSubTitlesFromFile:(NSString *)path