From: kramm <kramm>
Date: Sat, 10 Sep 2005 12:32:45 +0000 (+0000)
Subject: added protection against using both --cat and --stack
X-Git-Tag: xpdf-3-01~60
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=a4418b8eadbf6f186ad1a8f6965efd9db072790f

added protection against using both --cat and --stack
---

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 13ff224..8981b1d 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -1125,6 +1125,11 @@ int main(int argn, char *argv[])
 	msg("<error> Can't combine --cat and --merge");
 	exit(1);
     }
+    
+    if(config.stack && config.cat) {
+	msg("<error> Can't combine --cat and --stack");
+	exit(1);
+    }
 
     if(config.stack) {
 	if(config.overlay) {