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
/
formattools.C
diff --git
a/cinelerra-5.1/cinelerra/formattools.C
b/cinelerra-5.1/cinelerra/formattools.C
index d3685e02dc692babaa532a8e54a22ae7142d6094..28f4b556461f7a1337a9272df7c7f497dcaa7637 100644
(file)
--- a/
cinelerra-5.1/cinelerra/formattools.C
+++ b/
cinelerra-5.1/cinelerra/formattools.C
@@
-493,14
+493,14
@@
void FormatTools::update(Asset *asset, int *strategy)
void FormatTools::close_format_windows()
{
// This is done in ~file
void FormatTools::close_format_windows()
{
// This is done in ~file
- if(
aparams_thread && aparams_thread->running())
- {
- aparams_thread->file->close_window();
+ if(
aparams_thread ) {
+ if( aparams_thread->running() )
+
aparams_thread->file->close_window();
aparams_thread->join();
}
aparams_thread->join();
}
- if(
vparams_thread && vparams_thread->running())
- {
- vparams_thread->file->close_window();
+ if(
vparams_thread ) {
+ if( vparams_thread->running() )
+
vparams_thread->file->close_window();
vparams_thread->join();
}
}
vparams_thread->join();
}
}