projects
/
goodguy
/
cinelerra.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
938dfbb
)
fix mistake of not checking both parts in
author
Good Guy
<good1.2guy@gmail.com>
Tue, 27 Dec 2022 22:26:33 +0000
(15:26 -0700)
committer
Good Guy
<good1.2guy@gmail.com>
Tue, 27 Dec 2022 22:26:33 +0000
(15:26 -0700)
cinelerra-5.1/cinelerra/cache.C
patch
|
blob
|
history
diff --git
a/cinelerra-5.1/cinelerra/cache.C
b/cinelerra-5.1/cinelerra/cache.C
index 7c640d9e76da927bbf44c1df2efe83e222e75d57..9186f1f090b4bd52c0f3f93faf7fd3405102f2d5 100644
(file)
--- a/
cinelerra-5.1/cinelerra/cache.C
+++ b/
cinelerra-5.1/cinelerra/cache.C
@@
-117,14
+117,15
@@
File* CICache::check_out(Asset *asset, EDL *edl, int block)
// cache deleted during checkout, destroy this
if( users == 1 ) {
-
current->Garbage::
remove_user();
+ remove_user();
total_lock->unlock();
return 0;
}
//printf("users: %i \n", users );
-
- current->Garbage::remove_user();
+ EDL *parent = edl->parent_edl;
+ if(parent)
+ remove_user();
total_lock->unlock();
//printf("check out %p %lx %s\n", current, tid, asset->path);
return current ? current->file : 0;