reload plugin btn in prefs, speed gang fader tweaks

[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..0c149cd40acc445d8626a060b7f7cae831ce0e00 100644 (file)
--- 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);