Merge branch 'bugfix-13568' into develop

runrevmark · runrevmark · commit a0d21aaa1c71 · 2014-10-09T10:48:21.000+01:00
diff --git a/docs/notes/bugfix-13568.md b/docs/notes/bugfix-13568.md
@@ -0,0 +1 @@
+#     Extra undo of paint tools crashes live code
diff --git a/engine/src/image_rep_mutable.cpp b/engine/src/image_rep_mutable.cpp
@@ -1943,13 +1943,19 @@ void MCMutableImageRep::image_undo(Ustruct *us)
 {
 	if (state & CS_DRAW)
 		return;
-
-	MCImageFreeBitmap(m_bitmap);
-	m_bitmap = m_undo_image;
-	m_undo_image = nil;
-
-	// MW-2011-08-18: [[ Layers ]] Invalidate the whole object.
-	m_owner->invalidate_rep(rect);
+    
+    // PM-2014-10-01: [[ Bug 13568 ]] Make sure that pressing undo (cmd+z) twice when using paint tools, the second undo undoes the first one.
+    MCImageBitmap *t_old_bitmap;
+    MCImageCopyBitmap(m_bitmap, t_old_bitmap);
+
+    MCImageFreeBitmap(m_bitmap);
+    m_bitmap = m_undo_image;
+    m_undo_image = nil;
+    /* UNCHECKED */ MCImageCopyBitmap(t_old_bitmap, m_undo_image);
+    
+    // MW-2011-08-18: [[ Layers ]] Invalidate the whole object.
+    m_owner->invalidate_rep(rect);
+   
 }
 
 void MCMutableImageRep::image_freeundo(Ustruct *us)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Extra undo of paint tools crashes live code`