projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
cache.C
diff --git
a/cinelerra-5.1/cinelerra/cache.C
b/cinelerra-5.1/cinelerra/cache.C
index 7c640d9e76da927bbf44c1df2efe83e222e75d57..a024fc43645bb362c35c35a8182eb532db9c9db4 100644
(file)
--- a/
cinelerra-5.1/cinelerra/cache.C
+++ b/
cinelerra-5.1/cinelerra/cache.C
@@
-117,14
+117,11
@@
File* CICache::check_out(Asset *asset, EDL *edl, int block)
// cache deleted during checkout, destroy this
if( users == 1 ) {
// cache deleted during checkout, destroy this
if( users == 1 ) {
- current->Garbage::remove_user();
- total_lock->unlock();
+ remove_user();
return 0;
}
return 0;
}
-
//printf("users: %i \n", users );
//printf("users: %i \n", users );
-
- current->Garbage::remove_user();
+ remove_user();
total_lock->unlock();
//printf("check out %p %lx %s\n", current, tid, asset->path);
return current ? current->file : 0;
total_lock->unlock();
//printf("check out %p %lx %s\n", current, tid, asset->path);
return current ? current->file : 0;