projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
undo fixes, viewer change_source rework, cleanup
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
vwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/vwindowgui.C
b/cinelerra-5.1/cinelerra/vwindowgui.C
index ea05537bb7b2ec6e67bdfe08dfd21a685c13f100..5ff595eeaec5801f23c60b0bb5006cbb486f3489 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/vwindowgui.C
@@
-424,6
+424,7
@@
int VWindowGUI::drag_stop()
{
highlighted = 0;
canvas->draw_refresh();
{
highlighted = 0;
canvas->draw_refresh();
+ unlock_window();
Indexable *indexable = mwindow->session->drag_assets->size() ?
mwindow->session->drag_assets->get(0) :
Indexable *indexable = mwindow->session->drag_assets->size() ?
mwindow->session->drag_assets->get(0) :
@@
-431,17
+432,12
@@
int VWindowGUI::drag_stop()
EDL *edl = mwindow->session->drag_clips->size() ?
mwindow->session->drag_clips->get(0) :
0;
EDL *edl = mwindow->session->drag_clips->size() ?
mwindow->session->drag_clips->get(0) :
0;
- if( vwindow->playback_engine->is_playing_back ) {
- unlock_window();
- vwindow->stop_playback(1);
- lock_window("VWindowGUI::drag_stop");
- }
-
if(indexable)
vwindow->change_source(indexable);
else
if(edl)
vwindow->change_source(edl);
if(indexable)
vwindow->change_source(indexable);
else
if(edl)
vwindow->change_source(edl);
+ lock_window("VWindowGUI::drag_stop");
return 1;
}
return 1;
}