From: Filippo Carone <littlejohn@videolan.org>
Date: Tue, 5 Dec 2006 23:42:58 +0000 (+0000)
Subject: libvlc_input_has_vout more consistent with function aim
X-Git-Tag: 0.9.0-test0~9075
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a10792f2b6e2d7a4184d2a3a48454ccfc2693a99;p=vlc

libvlc_input_has_vout more consistent with function aim
---

diff --git a/src/control/video.c b/src/control/video.c
index 8627e3ca02..371739f645 100644
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -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 );