]> git.sesse.net Git - vlc/commitdiff
libvlc_input_has_vout more consistent with function aim
authorFilippo Carone <littlejohn@videolan.org>
Tue, 5 Dec 2006 23:42:58 +0000 (23:42 +0000)
committerFilippo Carone <littlejohn@videolan.org>
Tue, 5 Dec 2006 23:42:58 +0000 (23:42 +0000)
src/control/video.c

index 8627e3ca028374669df69af0d70c53c2c3036a3d..371739f645220fca9de5986ee78edcf4b7cec7a7 100644 (file)
@@ -197,11 +197,13 @@ vlc_bool_t libvlc_input_has_vout( libvlc_input_t *p_input,
                                   libvlc_exception_t *p_e )
 {
     vout_thread_t *p_vout = GetVout( p_input, p_e );
-
-    /* GetVout will raise the exception for us */
-    if( !p_vout )
+    if ( libvlc_exception_raised( p_e ) )
     {
-        return VLC_FALSE;
+        if ( strcmp( "No active video output", libvlc_exception_get_message( p_e ) ) == 0 )
+       {
+           libvlc_exception_clear( p_e );
+       }
+       return VLC_FALSE;
     }
 
     vlc_object_release( p_vout );