X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fundostack.C;h=23f33bc193148fadc237dc9ed85d8e8133429778;hp=59eadada8047ecd3cdf7c02670037515754b4141;hb=HEAD;hpb=e21b91bb19b37efa7644445f6137ee926d685795

diff --git a/cinelerra-5.1/cinelerra/undostack.C b/cinelerra-5.1/cinelerra/undostack.C
index 59eadada..23f33bc1 100644
--- a/cinelerra-5.1/cinelerra/undostack.C
+++ b/cinelerra-5.1/cinelerra/undostack.C
@@ -27,6 +27,9 @@
 #include "undostack.h"
 #include <string.h>
 
+// undo can be incremental or direct, from key to current
+//#define UNDO_INCREMENTAL
+
 UndoStack::UndoStack() : List<UndoStackItem>()
 {
 	current = 0;
@@ -55,37 +58,30 @@ UndoStackItem *UndoStack::get_current_redo()
 
 UndoStackItem* UndoStack::push()
 {
-// current is only 0 if before first undo
-	if( current )
-		current = insert_after(current);
-	else
-		current = insert_before(first);
-
-// delete future undos if necessary
-	if( current && current->next ) {
-		while( current->next ) remove(last);
-	}
-
 // delete oldest 2 undos if necessary
 	if( total() > UNDOLEVELS ) {
-		for( int i=0; i<2; ++i ) {
-			UndoStackItem *second = first->next;
-			char *temp_data = 0;
-
-
-			if( !second->is_key() ) {
-				temp_data = second->get_data();
-			}
-			remove(first);
-
-// Convert new first to key buffer.
-			if( !second->is_key() ) {
-				second->set_data(temp_data);
-			}
-			delete [] temp_data;
+		UndoStackItem *item = first, *key = item;
+#ifdef UNDO_INCREMENTAL
+		for( int i=2; --i>=0; item=item->next );
+#else
+		for( int i=2; --i>=0; item=item->next )
+			if( item->is_key() ) key = item;
+#endif
+		char *data = !item->is_key() ? key->get_data() : 0;
+		while( first != item ) {
+			if( current == first ) current = first->next;
+			delete first;
+		}
+		if( data ) {
+			item->set_data(data);
+			delete [] data;
 		}
 	}
 
+// current is only 0 if before first undo
+	current = current ? insert_after(current) : insert_before(first);
+// delete future undos if necessary
+	while( current->next ) remove(last);
 	return current;
 }
 
@@ -120,9 +116,6 @@ void UndoStack::dump(FILE *fp)
 	}
 }
 
-// undo can be incremental or direct, from key to current
-//#define UNDO_INCREMENTAL
-
 class undo_record {
 public:
 	int32_t new_ofs;