projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
histogram rework to add sum_frames, update suv/cakewalk autorange icons, add new...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mainundo.C
diff --git
a/cinelerra-5.1/cinelerra/mainundo.C
b/cinelerra-5.1/cinelerra/mainundo.C
index 9f69f8eb4754b8064dfc28590a202e24e4b70e62..c19a6ada63a00de0b368b5fb6d5f00d0f3c1e375 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mainundo.C
+++ b/
cinelerra-5.1/cinelerra/mainundo.C
@@
-219,12
+219,11
@@
int MainUndo::undo()
}
}
}
}
+ mwindow->reset_caches(1);
reset_creators();
reset_creators();
- mwindow->reset_caches();
return 0;
}
return 0;
}
-
int MainUndo::redo()
{
mwindow->gui->close_keyvalue_popup();
int MainUndo::redo()
{
mwindow->gui->close_keyvalue_popup();
@@
-247,8
+246,8
@@
int MainUndo::redo()
update_caption(current ? current->get_description() : "");
}
}
update_caption(current ? current->get_description() : "");
}
}
+ mwindow->reset_caches(1);
reset_creators();
reset_creators();
- mwindow->reset_caches();
//dump();
return 0;
}
//dump();
return 0;
}
@@
-257,6
+256,7
@@
int MainUndo::redo()
// Here the master EDL loads
int MainUndo::load_from_undo(FileXML *file, uint32_t load_flags)
{
// 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();
if( load_flags & LOAD_SESSION ) {
mwindow->gui->unlock_window();
mwindow->close_mixers();