diff options
| author | Bastien Nocera <hadess@users.sourceforge.net> | 2006-03-17 18:52:04 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@users.sourceforge.net> | 2006-03-17 18:52:04 +0000 |
| commit | 691a65bf72f3aac9ebed2343c347fd2b5a33e31b (patch) | |
| tree | da4826fba31db77a9cc76585931a7b7be0eec78b | |
| parent | 578b1e2bcc5081a39eb7bd3166f29c3e3db162c2 (diff) | |
| download | xine-lib-691a65bf72f3aac9ebed2343c347fd2b5a33e31b.tar.gz xine-lib-691a65bf72f3aac9ebed2343c347fd2b5a33e31b.tar.bz2 | |
- Only fail to open the stream if we can't parse the possible option, not
if we can't change it. Fix GNOME bug #334666:
http://bugzilla.gnome.org/show_bug.cgi?id=334666
trying to open:
mms://media.fastweb.it/WM9/raiclick/FMVRAI04000000001441.wmv?idCnt=368&path=RaiClickWeb^Spettacolo^Jazz#1
CVS patchset: 7935
CVS date: 2006/03/17 18:52:04
| -rw-r--r-- | src/xine-engine/xine.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index b97ae7157..8dac5c264 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.321 2006/01/27 07:46:16 tmattern Exp $ + * $Id: xine.c,v 1.322 2006/03/17 18:52:04 hadess Exp $ */ /* @@ -999,15 +999,15 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { if (retval == 0) { /* the option not found */ xine_log(stream->xine, XINE_LOG_MSG, _("xine: error while parsing MRL\n")); + stream->err = XINE_ERROR_MALFORMED_MRL; + stream->status = XINE_STATUS_IDLE; + free(config_entry); + return 0; } else { /* not permitted to change from MRL */ xine_log(stream->xine, XINE_LOG_MSG, _("xine: changing option '%s' from MRL isn't permitted\n"), config_entry); } - stream->err = XINE_ERROR_MALFORMED_MRL; - stream->status = XINE_STATUS_IDLE; - free(config_entry); - return 0; } free(config_entry); } |