projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ff tooltip, shcmds doc, bld_prepare fix, edl load_xml fix
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
edl.C
diff --git
a/cinelerra-5.1/cinelerra/edl.C
b/cinelerra-5.1/cinelerra/edl.C
index 3dc2153e7c7d09cb6d83c5bec671842e0f7ed058..9e14b082d9c003af3c534cee3bff931f5718054b 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edl.C
+++ b/
cinelerra-5.1/cinelerra/edl.C
@@
-301,7
+301,8
@@
int EDL::load_xml(FileXML *file,
else
if(file->tag.title_is("ASSETS"))
{
- if(load_flags & LOAD_ASSETS)
+ if((load_flags & LOAD_ASSETS) &&
+ !parent_edl)
assets->load(file, load_flags);
else
result = file->skip_tag();