summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-03-07 17:00:56 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-03-07 17:00:56 +0000
commitde32e15f3b97963da9670a2e32609c4b1f033775 (patch)
tree21added25da3ac929e2af3c33f3eec7489c4ac85
parentf096a5df6ac3e992c44efb14c135e4b176fd086a (diff)
downloadxine-lib-de32e15f3b97963da9670a2e32609c4b1f033775.tar.gz
xine-lib-de32e15f3b97963da9670a2e32609c4b1f033775.tar.bz2
use return value of MRL-based config changing
CVS patchset: 4360 CVS date: 2003/03/07 17:00:56
-rw-r--r--src/xine-engine/xine.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 02dbc64a4..bc37ee9b7 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.234 2003/03/07 12:51:48 guenter Exp $
+ * $Id: xine.c,v 1.235 2003/03/07 17:00:56 mroi Exp $
*
* top-level xine functions
*
@@ -743,7 +743,13 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) {
config_entry[strlen(tmp)] = '\0';
}
mrl_unescape(config_entry);
- xine_config_change_opt(stream->xine->config, config_entry);
+ if (!xine_config_change_opt(stream->xine->config, config_entry)) {
+ free(config_entry);
+ printf("xine: error while parsing mrl\n");
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+ stream->status = XINE_STATUS_STOP;
+ return 0;
+ }
free(config_entry);
}
}