projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to ffmpeg-2.8
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
keyframegui.C
diff --git
a/cinelerra-5.0/cinelerra/keyframegui.C
b/cinelerra-5.0/cinelerra/keyframegui.C
index 9fa52dcd173df119f2b67f9d75d1795856504c49..ff14ae50849ca23109f9b5e98f4a7af29df10697 100644
(file)
--- a/
cinelerra-5.0/cinelerra/keyframegui.C
+++ b/
cinelerra-5.0/cinelerra/keyframegui.C
@@
-60,6
+60,7
@@
KeyFrameThread::KeyFrameThread(MWindow *mwindow)
KeyFrameThread::~KeyFrameThread()
{
KeyFrameThread::~KeyFrameThread()
{
+ close_window();
for(int i = 0; i < KEYFRAME_COLUMNS; i++)
keyframe_data[i].remove_all_objects();
delete [] keyframe_data;
for(int i = 0; i < KEYFRAME_COLUMNS; i++)
keyframe_data[i].remove_all_objects();
delete [] keyframe_data;
@@
-206,18
+207,6
@@
void KeyFrameThread::handle_close_event(int result)
keyframe = 0;
}
keyframe = 0;
}
-void KeyFrameThread::close_window()
-{
- lock_window("KeyFrameThread::close_window");
- if(get_gui())
- {
- get_gui()->lock_window("KeyFrameThread::close_window");
- get_gui()->set_done(1);
- get_gui()->unlock_window();
- }
- unlock_window();
-}
-
void KeyFrameThread::calculate_preset_list()
void KeyFrameThread::calculate_preset_list()