undo nested clip bug, wheel zoom redraw fix, uninited vars, shortcuts doc

[goodguy/history.git] / cinelerra-5.1 / cinelerra / mainundo.C

diff --git a/cinelerra-5.1/cinelerra/mainundo.C b/cinelerra-5.1/cinelerra/mainundo.C
index 9cd3562eba166f9dd1019f9712cd925ce74f8671..14268e1d37709f5d0b57e17cb4b89c919c53450d 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainundo.C
+++ b/cinelerra-5.1/cinelerra/mainundo.C
@@ -260,6 +260,12 @@ int MainUndo::load_from_undo(FileXML *file, uint32_t load_flags)
                mwindow->close_mixers();
                mwindow->gui->lock_window("MainUndo::load_from_undo");
        }
+       if( (load_flags & LOAD_ALL) == LOAD_ALL ) {
+               EDL *edl = new EDL;
+               edl->create_objects();
+               mwindow->edl->remove_user();
+               mwindow->edl = 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);