projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change thread join strategy, fix a few leaks, fix a few bugs
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
commercials.C
diff --git
a/cinelerra-5.1/cinelerra/commercials.C
b/cinelerra-5.1/cinelerra/commercials.C
index a08ec02921e1e058c1d07c78470d23affe75a9c3..2485f263fca69c0f7b96c91a36a74b02647bc1cf 100644
(file)
--- a/
cinelerra-5.1/cinelerra/commercials.C
+++ b/
cinelerra-5.1/cinelerra/commercials.C
@@
-787,8
+787,8
@@
stop()
if( running() ) {
if( gui ) gui->set_done(1);
cancel();
if( running() ) {
if( gui ) gui->set_done(1);
cancel();
- join();
}
}
+ join();
}
void ScanStatus::
}
void ScanStatus::
@@
-856,8
+856,8
@@
stop()
done = 1;
input_lock->unlock();
cancel();
done = 1;
input_lock->unlock();
cancel();
- join();
}
}
+ join();
if( commercials && !commercials->remove_user() )
commercials = 0;
}
if( commercials && !commercials->remove_user() )
commercials = 0;
}