X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmaskauto.C;fp=cinelerra-5.1%2Fcinelerra%2Fmaskauto.C;h=e490f4c854334bf259f9a1bc4958ebabe2cef1e6;hb=3f801b05e0de577b00e98019b099ed38d66b9550;hp=3ddd946338219262d1fa0ec699109ca8832ad394;hpb=56923cfe421f547a8ba1c6a4a6e9225877b121c6;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/maskauto.C b/cinelerra-5.1/cinelerra/maskauto.C
index 3ddd9463..e490f4c8 100644
--- a/cinelerra-5.1/cinelerra/maskauto.C
+++ b/cinelerra-5.1/cinelerra/maskauto.C
@@ -96,10 +96,12 @@ int SubMask::operator==(SubMask& ptr)
 	return equivalent(ptr);
 }
 
-void SubMask::copy_from(SubMask& ptr)
+void SubMask::copy_from(SubMask& ptr, int do_name)
 {
-	memset(name, 0, sizeof(name));
-	strncpy(name, ptr.name, sizeof(name-1));
+	if( do_name ) {
+		memset(name, 0, sizeof(name));
+		strncpy(name, ptr.name, sizeof(name-1));
+	}
 	fader = ptr.fader;
 	feather = ptr.feather;
 	points.remove_all_objects();
@@ -140,7 +142,8 @@ void SubMask::copy(FileXML *file)
 	if(points.total)
 	{
 		file->tag.set_title("MASK");
-		file->tag.set_property("NUMBER", keyframe->masks.number_of(this));
+		file->tag.set_property("NUMBER",
+			!keyframe ? -1 : keyframe->masks.number_of(this));
 		file->tag.set_property("NAME", name);
 		file->tag.set_property("FADER", fader);
 		file->tag.set_property("FEATHER", feather);