X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainundo.C;h=0c149cd40acc445d8626a060b7f7cae831ce0e00;hb=2ce5f3585284c78107b6eab879ee4e94686ff41a;hp=3bc8d7cfde8af8135574fc4d1f2acadb13a8dbbc;hpb=f007a674187f11ab58a5aebfe1eec27a90398bcb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mainundo.C b/cinelerra-5.1/cinelerra/mainundo.C
index 3bc8d7cf..0c149cd4 100644
--- a/cinelerra-5.1/cinelerra/mainundo.C
+++ b/cinelerra-5.1/cinelerra/mainundo.C
@@ -255,11 +255,18 @@ int MainUndo::redo()
 // Here the master EDL loads
 int MainUndo::load_from_undo(FileXML *file, uint32_t load_flags)
 {
+	delete mwindow->gui->keyvalue_popup;
+	mwindow->gui->keyvalue_popup = 0;
+
 	if( load_flags & LOAD_SESSION ) {
 		mwindow->gui->unlock_window();
 		mwindow->close_mixers();
 		mwindow->gui->lock_window("MainUndo::load_from_undo");
 	}
+	if( (load_flags & LOAD_ALL) == LOAD_ALL ) {
+		mwindow->edl->remove_user();
+		mwindow->init_edl();
+	}
 	mwindow->edl->load_xml(file, load_flags);
 	for( Asset *asset=mwindow->edl->assets->first; asset; asset=asset->next ) {
 		mwindow->mainindexes->add_next_asset(0, asset);
@@ -292,3 +299,30 @@ void MainUndo::dump(FILE *fp)
 	undo_stack->dump(fp);
 }
 
+void MainUndo::save(FILE *fp)
+{
+	undo_stack->save(fp);
+}
+
+void MainUndo::load(FILE *fp)
+{
+	undo_stack->load(fp);
+	UndoStackItem *current = undo_stack->current;
+	char *current_data = current ? current->get_data() : 0;
+	if( !current_data ) return;
+	mwindow->gui->lock_window("MainUndo::load");
+	UndoStackItem *next = current->next;
+	mwindow->gui->mainmenu->redo->
+		update_caption(next ? next->get_description() : "");
+	mwindow->set_filename(current->get_filename());
+	FileXML file;
+	file.read_from_string(current_data);
+	load_from_undo(&file, LOAD_ALL);
+	delete [] current_data;
+	UndoStackItem *prev = current->previous;
+	mwindow->gui->mainmenu->undo->
+		update_caption(prev ? prev->get_description() : "");
+	mwindow->update_project(LOADMODE_REPLACE);
+	mwindow->gui->unlock_window();
+}
+