X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainundo.C;h=5b0a70bd2ec77e9b3d584a9fe8a617f743f928f5;hb=HEAD;hp=9f69f8eb4754b8064dfc28590a202e24e4b70e62;hpb=84ac8a2bb3357c04a3f67cf763b0f61ddbbd021d;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/mainundo.C b/cinelerra-5.1/cinelerra/mainundo.C index 9f69f8eb..5b0a70bd 100644 --- a/cinelerra-5.1/cinelerra/mainundo.C +++ b/cinelerra-5.1/cinelerra/mainundo.C @@ -198,11 +198,9 @@ int MainUndo::undo() } if( current ) { // Set the redo text to the current description - if( mwindow->gui ) { - UndoStackItem *next = NEXT; - mwindow->gui->mainmenu->redo-> - update_caption(next ? next->get_description() : ""); - } + UndoStackItem *next = NEXT; + mwindow->gui->mainmenu->redo-> + update_caption(next ? next->get_description() : ""); char *current_data = current->get_data(); if( current_data ) { FileXML file; @@ -219,12 +217,11 @@ int MainUndo::undo() } } + mwindow->reset_caches(1); reset_creators(); - mwindow->reset_caches(); return 0; } - int MainUndo::redo() { mwindow->gui->close_keyvalue_popup(); @@ -247,8 +244,8 @@ int MainUndo::redo() update_caption(current ? current->get_description() : ""); } } + mwindow->reset_caches(1); reset_creators(); - mwindow->reset_caches(); //dump(); return 0; } @@ -257,6 +254,7 @@ int MainUndo::redo() // Here the master EDL loads int MainUndo::load_from_undo(FileXML *file, uint32_t load_flags) { + mwindow->hide_plugins(); if( load_flags & LOAD_SESSION ) { mwindow->gui->unlock_window(); mwindow->close_mixers();