projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve resize flash operation, fixup xv grab/ungrab, fixup label updates
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
setformat.C
diff --git
a/cinelerra-5.1/cinelerra/setformat.C
b/cinelerra-5.1/cinelerra/setformat.C
index 17550381bbf7072ec9011885eb5f9a3f0335bf18..413fa950357b3f029b0c400452cf9f4ee5c41fe0 100644
(file)
--- a/
cinelerra-5.1/cinelerra/setformat.C
+++ b/
cinelerra-5.1/cinelerra/setformat.C
@@
-94,8
+94,8
@@
SetFormatThread::~SetFormatThread()
if( running() ) {
window->set_done(1);
cancel();
if( running() ) {
window->set_done(1);
cancel();
- join();
}
}
+ join();
delete window_lock;
}
delete window_lock;
}
@@
-479,7
+479,7
@@
void SetFormatWindow::create_objects()
thread,
&(thread->new_settings->session->aspect_w)));
x += aspect_w->get_w() + 5;
thread,
&(thread->new_settings->session->aspect_w)));
x += aspect_w->get_w() + 5;
- add_subwindow(new BC_Title(x, y,
_(":")
));
+ add_subwindow(new BC_Title(x, y,
":"
));
x += 10;
add_subwindow(aspect_h = new ScaleAspectText(x,
y,
x += 10;
add_subwindow(aspect_h = new ScaleAspectText(x,
y,