X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=25698eedcb8a902c07061f80dd77839b88faeeb1;hb=918a290574399a88456bbc70d7064c04ab8f6819;hp=a1437c1953c405f6cabf912bcabfdf24c2f3bdaa;hpb=59c093ee0efccf7ea0045b62e4a927e0e0fd9a7c;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index a1437c1..25698ee 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -1022,8 +1022,12 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
 
     if (spriteid<0 && !config.isframe) {
 	if(slavename) {
-	    if(strcmp(slavename,"!!dummy!!"))
+	    if(strcmp(slavename,"!!dummy!!")) {
 		msg("<warning> Didn't find anything named %s in file. No substitutions will occur.", slavename);
+		if(!strcmp(slavename, "swf")) {
+		    msg("<warning> (If you were trying to combine rfxview with a document, try replacing 'swf' with 'viewport'.");
+		}
+	    }
 	}
 	else
 	    msg("<warning> Didn't find id %d in file. No substitutions will occur.", slaveid);
@@ -1062,7 +1066,7 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
 		FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES|   FLAGS_WRITESPRITE	);
     }
 
-    swf_DeleteTag(newswf, tag);
+    swf_DeleteTag(newswf, newswf->firstTag);
 }
 
 void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)