From 421e94204353a14c5d79174f782f66aa05063f99 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 3 Feb 2004 14:50:00 +0000 Subject: [PATCH] Fixed warnings linked to the "--dont-link" renaming. --- src/mkvmerge.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/mkvmerge.cpp b/src/mkvmerge.cpp index b27577305..22fd4afd1 100644 --- a/src/mkvmerge.cpp +++ b/src/mkvmerge.cpp @@ -1828,14 +1828,15 @@ static void parse_args(int argc, char **argv) { mxexit(); } - if (no_linking) { - if ((seguid_link_previous != NULL) || (seguid_link_next != NULL)) - mxerror("'--dont-link' cannot be used together with " - "'--link-to-previous' or '--link-to-next'.\n"); - - if (split_after <= 0) - mxwarn("'--dont-link' is only useful in combination with '--split'.\n"); + if (no_linking && + ((seguid_link_previous != NULL) || (seguid_link_next != NULL))) { + mxwarn("'--link' must be used if '--link-to-previous' or " + "'--link-to-next' are used as well. Turning it on.\n"); + no_linking = false; } + if ((split_after <= 0) && !no_linking) + mxwarn("'--link', '--link-to-previous' and '--link-to-next' are " + "only useful in combination with '--split'.\n"); for (i = 0; i < attachments.size(); i++) { attachment_sizes_first += attachments[i]->size;