mixer undo fix, new ffmpeg opts, docs

[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 4e7a6fca79fb0ba9230bb39d8a6617c40c6b056f..7890343dd1870b41eb23ea1aea56ccbf79299b99 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainundo.C
+++ b/cinelerra-5.1/cinelerra/mainundo.C
@@ -293,6 +293,8 @@ int MainUndo::redo()
 // Here the master EDL loads
 int MainUndo::load_from_undo(FileXML *file, uint32_t load_flags)
 {
+       if( load_flags & LOAD_SESSION )
+               mwindow->close_mixers();
        mwindow->edl->load_xml(file, load_flags);
        for(Asset *asset = mwindow->edl->assets->first;
                asset;
@@ -308,6 +310,8 @@ int MainUndo::load_from_undo(FileXML *file, uint32_t load_flags)
        }
        mwindow->mainindexes->start_build();
        mwindow->update_plugin_guis(1);
+       if( load_flags & LOAD_SESSION )
+               mwindow->open_mixers();
        return 0;
 }