projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
req input focus wdw be viewable
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
resizetrackthread.C
diff --git
a/cinelerra-5.1/cinelerra/resizetrackthread.C
b/cinelerra-5.1/cinelerra/resizetrackthread.C
index 4af7eb75bab7c47f698d4c65c2f228adac02be0f..f8e3de367561a23568d7089204a981b54cfd1d6b 100644
(file)
--- a/
cinelerra-5.1/cinelerra/resizetrackthread.C
+++ b/
cinelerra-5.1/cinelerra/resizetrackthread.C
@@
-118,9
+118,8
@@
ResizeVTrackWindow::~ResizeVTrackWindow()
void ResizeVTrackWindow::create_objects()
{
void ResizeVTrackWindow::create_objects()
{
- int x = 10, y = 10;
-
lock_window("ResizeVTrackWindow::create_objects");
lock_window("ResizeVTrackWindow::create_objects");
+ int x = 10, y = 10;
BC_Title *size_title = new BC_Title(x, y, _("Size:"));
add_subwindow(size_title);
int x1 = x + size_title->get_w();
BC_Title *size_title = new BC_Title(x, y, _("Size:"));
add_subwindow(size_title);
int x1 = x + size_title->get_w();
@@
-299,7
+298,8
@@
void ResizeTrackThread::start_window(Track *track)
void ResizeTrackThread::update()
{
void ResizeTrackThread::update()
{
- mwindow->resize_track(track, w, h);
+ if( mwindow->edl->tracks->track_exists(track) )
+ mwindow->resize_track(track, w, h);
}
}
@@
-340,7
+340,6
@@
ResizeAssetButton::ResizeAssetButton(AssetEditWindow *fwindow, int x, int y)
{
resize_asset_thread = 0;
this->fwindow = fwindow;
{
resize_asset_thread = 0;
this->fwindow = fwindow;
- set_underline(0);
}
ResizeAssetButton::~ResizeAssetButton()
}
ResizeAssetButton::~ResizeAssetButton()
@@
-350,7
+349,8
@@
ResizeAssetButton::~ResizeAssetButton()
int ResizeAssetButton::handle_event()
{
int ResizeAssetButton::handle_event()
{
- resize_asset_thread = new ResizeAssetThread(fwindow);
+ if( !resize_asset_thread )
+ resize_asset_thread = new ResizeAssetThread(fwindow);
resize_asset_thread->start_window(fwindow->asset_edit->changed_params);
return 1;
}
resize_asset_thread->start_window(fwindow->asset_edit->changed_params);
return 1;
}