[vlc-devel] commit: Do not warn about unsupported demux/access when aborting. ( Laurent Aimar )

[git version control]

vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Fri Jun 19 00:52:30 2009 +0200| [c36f1f2fe5e91997f59a48ad30d1bba619401ea9] | committer: Derk-Jan Hartman 

Do not warn about unsupported demux/access when aborting.
(cherry picked from commit ae5abca4dc35db81aad5b7617f5f41b6e970f6d9)

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>

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

 src/input/input.c |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index e6f60e2..c849ae5 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2479,11 +2479,14 @@ static int InputSourceInit( input_thread_t *p_input,
         in->p_access = access_New( p_input, psz_access, psz_demux, psz_path );
         if( in->p_access == NULL )
         {
-            msg_Err( p_input, "open of `%s' failed: %s", psz_mrl,
-                                                         msg_StackMsg() );
-            dialog_Fatal( p_input, _("Your input can't be opened"),
-                          _("VLC is unable to open the MRL '%s'."
-                            " Check the log for details."), psz_mrl );
+            if( vlc_object_alive( p_input ) )
+            {
+                msg_Err( p_input, "open of `%s' failed: %s", psz_mrl,
+                                                             msg_StackMsg() );
+                dialog_Fatal( p_input, _("Your input can't be opened"),
+                              _("VLC is unable to open the MRL '%s'."
+                                " Check the log for details."), psz_mrl );
+            }
             goto error;
         }
 
@@ -2610,12 +2613,15 @@ static int InputSourceInit( input_thread_t *p_input,
 
         if( in->p_demux == NULL )
         {
-            msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
-                     psz_access, psz_demux, psz_path );
-            dialog_Fatal( VLC_OBJECT( p_input ),
-                          _("VLC can't recognize the input's format"),
-                          _("The format of '%s' cannot be detected. "
-                            "Have a look at the log for details."), psz_mrl );
+            if( vlc_object_alive( p_input ) )
+            {
+                msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
+                         psz_access, psz_demux, psz_path );
+                dialog_Fatal( VLC_OBJECT( p_input ),
+                              _("VLC can't recognize the input's format"),
+                              _("The format of '%s' cannot be detected. "
+                                "Have a look at the log for details."), psz_mrl );
+            }
             goto error;
         }