projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix boxblur segv, tweak guicast Makefile for 3rd party includes, fix title drag box...
[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 0c149cd40acc445d8626a060b7f7cae831ce0e00..520bc2ee729a876e5c7b68c4b3213c409fb45ad3 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mainundo.C
+++ b/
cinelerra-5.1/cinelerra/mainundo.C
@@
-209,12
+209,10
@@
int MainUndo::undo()
//printf("MainUndo::undo %d %s\n", __LINE__, current->get_filename());
mwindow->set_filename(current->get_filename());
//printf("MainUndo::undo %d %s\n", __LINE__, current->get_filename());
mwindow->set_filename(current->get_filename());
- if( mwindow->gui ) {
// Now update the menu with the after entry
// Now update the menu with the after entry
- UndoStackItem *prev = PREVIOUS;
- mwindow->gui->mainmenu->undo->
- update_caption(prev ? prev->get_description() : "");
- }
+ UndoStackItem *prev = PREVIOUS;
+ mwindow->gui->mainmenu->undo->
+ update_caption(prev ? prev->get_description() : "");
}
}
}
}
@@
-269,11
+267,11
@@
int MainUndo::load_from_undo(FileXML *file, uint32_t load_flags)
}
mwindow->edl->load_xml(file, load_flags);
for( Asset *asset=mwindow->edl->assets->first; asset; asset=asset->next ) {
}
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);
+ mwindow->mainindexes->add_
indexable(
asset);
}
for( int i=0; i<mwindow->edl->nested_edls.size(); ++i ) {
EDL *nested_edl = mwindow->edl->nested_edls[i];
}
for( int i=0; i<mwindow->edl->nested_edls.size(); ++i ) {
EDL *nested_edl = mwindow->edl->nested_edls[i];
- mwindow->mainindexes->add_
next_asset(0,
nested_edl);
+ mwindow->mainindexes->add_
indexable(
nested_edl);
}
mwindow->mainindexes->start_build();
mwindow->update_plugin_guis(1);
}
mwindow->mainindexes->start_build();
mwindow->update_plugin_guis(1);