projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
batchrender hang on close, apply pref saves defaults, overwrite/splice tweaks, specif...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
batchrender.C
diff --git
a/cinelerra-5.1/cinelerra/batchrender.C
b/cinelerra-5.1/cinelerra/batchrender.C
index 9e45b3ec0a7e13054bee3c1c161fc471516ed1d0..4c5f1d4bac8b1375afda0e996fe89eb3a88f3cfa 100644
(file)
--- a/
cinelerra-5.1/cinelerra/batchrender.C
+++ b/
cinelerra-5.1/cinelerra/batchrender.C
@@
-672,6
+672,8
@@
BatchRenderGUI::BatchRenderGUI(MWindow *mwindow,
BatchRenderGUI::~BatchRenderGUI()
{
lock_window("BatchRenderGUI::~BatchRenderGUI");
BatchRenderGUI::~BatchRenderGUI()
{
lock_window("BatchRenderGUI::~BatchRenderGUI");
+ loadlist_batch->stop();
+ savelist_batch->stop();
delete format_tools;
unlock_window();
}
delete format_tools;
unlock_window();
}
@@
-996,16
+998,17
@@
BatchRenderSaveList::BatchRenderSaveList(BatchRenderThread *thread, int x, int y
}
BatchRenderSaveList::~BatchRenderSaveList()
}
BatchRenderSaveList::~BatchRenderSaveList()
+{
+ stop();
+ delete startup_lock;
+}
+
+void BatchRenderSaveList::stop()
{
startup_lock->lock("BatchRenderSaveList::~BrowseButton");
{
startup_lock->lock("BatchRenderSaveList::~BrowseButton");
- if( gui ) {
- gui->lock_window();
- gui->set_done(1);
- gui->unlock_window();
- }
+ if( gui ) gui->set_done(1);
startup_lock->unlock();
Thread::join();
startup_lock->unlock();
Thread::join();
- delete startup_lock;
}
int BatchRenderSaveList::handle_event()
}
int BatchRenderSaveList::handle_event()
@@
-1046,7
+1049,6
@@
void BatchRenderSaveList::run()
thread->save_jobs(thread->batch_path);
}
thread->save_jobs(thread->batch_path);
}
- this->thread->gui->flush();
startup_lock->lock("BatchRenderLoadList::run");
gui = 0;
startup_lock->unlock();
startup_lock->lock("BatchRenderLoadList::run");
gui = 0;
startup_lock->unlock();
@@
-1072,16
+1074,17
@@
BatchRenderLoadList::BatchRenderLoadList(BatchRenderThread *thread,
}
BatchRenderLoadList::~BatchRenderLoadList()
}
BatchRenderLoadList::~BatchRenderLoadList()
+{
+ stop();
+ delete startup_lock;
+}
+
+void BatchRenderLoadList::stop()
{
startup_lock->lock("BatchRenderLoadList::~BrowseButton");
{
startup_lock->lock("BatchRenderLoadList::~BrowseButton");
- if( gui ) {
- gui->lock_window();
- gui->set_done(1);
- gui->unlock_window();
- }
+ if( gui ) gui->set_done(1);
startup_lock->unlock();
Thread::join();
startup_lock->unlock();
Thread::join();
- delete startup_lock;
}
int BatchRenderLoadList::handle_event()
}
int BatchRenderLoadList::handle_event()
@@
-1125,7
+1128,6
@@
void BatchRenderLoadList::run()
thread->gui->change_job();
}
thread->gui->change_job();
}
- thread->gui->flush();
startup_lock->lock("BatchRenderLoadList::run");
gui = 0;
startup_lock->unlock();
startup_lock->lock("BatchRenderLoadList::run");
gui = 0;
startup_lock->unlock();