[vlc-devel] commit: Do not try other protocols when ask to quit (mms). (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Nov 24 19:09:15 2008 +0100| [222e2acb01f1fb88d5509a085cc02e1584d66a7a] | committer: Laurent Aimar 

Do not try other protocols when ask to quit (mms).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=222e2acb01f1fb88d5509a085cc02e1584d66a7a
---

 modules/access/mms/mms.c   |    5 ++++-
 modules/access/mms/mmstu.c |    3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/access/mms/mms.c b/modules/access/mms/mms.c
index 04763ff..efc2be1 100644
--- a/modules/access/mms/mms.c
+++ b/modules/access/mms/mms.c
@@ -136,8 +136,11 @@ static int Open( vlc_object_t *p_this )
         }
     }
 
-    if(  MMSTUOpen ( p_access ) )
+    if( MMSTUOpen ( p_access ) )
     {
+        if( p_access->b_die )
+            return VLC_EGENERIC;
+
         /* try mmsh if mmstu failed */
         return  MMSHOpen ( p_access );
     }
diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index d7f8586..6961545 100644
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -155,7 +155,8 @@ int  MMSTUOpen( access_t *p_access )
     {   /* first try with TCP and then UDP*/
         if( ( i_status = MMSOpen( p_access, &p_sys->url, MMS_PROTO_TCP ) ) )
         {
-            i_status = MMSOpen( p_access, &p_sys->url, MMS_PROTO_UDP );
+            if( !p_access->b_die )
+                i_status = MMSOpen( p_access, &p_sys->url, MMS_PROTO_UDP );
         }
     }
     else