From 2610c6406445c8ed1d1df1ab37eccf1a7ab950b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 12 Feb 2005 17:37:38 +0000 Subject: [PATCH] Don't send 'Hey! You gave me a NULL pointer yo naughty person' as error message when we can't open the DVD device; se... Original commit message from CVS: Don't send 'Hey! You gave me a NULL pointer yo naughty person' as error message when we can't open the DVD device; send something more useful instead (fixes #167117) --- ChangeLog | 8 ++++++++ ext/dvdnav/dvdnavsrc.c | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a35907563..bfdc03405a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-02-12 Tim-Philipp Müller + + * ext/dvdnav/dvdnavsrc.c: (dvdnavsrc_open): + Don't send "Hey! You gave me a NULL pointer you naughty person" as + error message when we can't open the DVD device (when dvdnav_open() + fails, src->dvdnav is NULL, so dvdnav_err_to_string() will return + the above). Send something more useful instead (fixes #167117). + 2005-02-11 Julien MOUTTE * sys/xvimage/xvimagesink.c: (gst_xvimagesink_xvimage_put), diff --git a/ext/dvdnav/dvdnavsrc.c b/ext/dvdnav/dvdnavsrc.c index 38fedcc5bb..4313ad5da0 100644 --- a/ext/dvdnav/dvdnavsrc.c +++ b/ext/dvdnav/dvdnavsrc.c @@ -1527,8 +1527,12 @@ dvdnavsrc_open (DVDNavSrc * src) g_return_val_if_fail (!dvdnavsrc_is_open (src), FALSE); g_return_val_if_fail (src->location != NULL, FALSE); - DVDNAV_CALLVAL (dvdnav_open, - (&src->dvdnav, (char *) src->location), src, FALSE); + if (dvdnav_open (&src->dvdnav, (char *) src->location) != DVDNAV_STATUS_OK) { + GST_ELEMENT_ERROR (src, LIBRARY, FAILED, + (_("Failed to open DVD device '%s'."), src->location), + GST_ERROR_SYSTEM); + return FALSE; + } GST_FLAG_SET (src, DVDNAVSRC_OPEN);