[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30321] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: bugfix [#22847] 18+ char Name in Edit Strip causes errors when duplicating strips

[Campbell Barton]

Revision: 30321
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30321
Author:   campbellbarton
Date:     2010-07-14 14:16:23 +0200 (Wed, 14 Jul 2010)

Log Message:
-----------
bugfix [#22847] 18+ char Name in Edit Strip causes errors when duplicating strips

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-07-14 11:58:19 UTC (rev 30320)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-07-14 12:16:23 UTC (rev 30321)
@@ -795,7 +795,7 @@
 	Sequence *seq;
 	for(seq=seqbasep->first; seq; seq= seq->next) {
 		if (sui->seq != seq && strcmp(sui->name_dest, seq->name+2)==0) {
-			sprintf(sui->name_dest, "%.18s.%03d",  sui->name_src, sui->count++);
+			sprintf(sui->name_dest, "%.17s.%03d",  sui->name_src, sui->count++); /*24 - 2 for prefix, -1 for \0 */
 			sui->match= 1; /* be sure to re-scan */
 		}
 	}
@@ -816,12 +816,17 @@
 	strcpy(sui.name_src, seq->name+2);
 	strcpy(sui.name_dest, seq->name+2);
 
+	sui.count= 1;
+	sui.match= 1; /* assume the worst to start the loop */
+
 	/* Strip off the suffix */
-	if ((dot=strrchr(sui.name_src, '.')))
+	if ((dot=strrchr(sui.name_src, '.'))) {
 		*dot= '\0';
+		dot++;
 
-	sui.count= 1;
-	sui.match= 1; /* assume the worst to start the loop */
+		if(*dot)
+			sui.count= atoi(dot) + 1;
+	}
 
 	while(sui.match) {
 		sui.match= 0;