clip picons as clip_icon.png, vwindow hang, fix for drop target test

[goodguy/history.git] / cinelerra-5.1 / cinelerra / vwindow.C

diff --git a/cinelerra-5.1/cinelerra/vwindow.C b/cinelerra-5.1/cinelerra/vwindow.C
index 7a24e1bcda33d524a2f2c7721a05d625e3ced78d..d1ea6b03cc199c99cf8016d99fa8da3ce062697d 100644 (file)
--- a/cinelerra-5.1/cinelerra/vwindow.C
+++ b/cinelerra-5.1/cinelerra/vwindow.C
@@ -273,13 +273,14 @@ void VWindow::change_source(EDL *edl)
        if( playback_engine->is_playing_back )
                stop_playback(1);
 
        if( playback_engine->is_playing_back )
                stop_playback(1);
 

-       gui->lock_window("VWindow::change_source 3");

 //printf("VWindow::change_source %d %p\n", __LINE__, edl);
 // EDLs are identical
 //     if(edl && mwindow->edl->vwindow_edl &&
 //             edl->id == mwindow->edl->vwindow_edl->id) return;
        if(edl && get_edl() && edl->id == get_edl()->id) return;
 
 //printf("VWindow::change_source %d %p\n", __LINE__, edl);
 // EDLs are identical
 //     if(edl && mwindow->edl->vwindow_edl &&
 //             edl->id == mwindow->edl->vwindow_edl->id) return;
        if(edl && get_edl() && edl->id == get_edl()->id) return;
 

+       gui->lock_window("VWindow::change_source 3");
+

        delete_source(1, 0);
 
        if(edl)
        delete_source(1, 0);
 
        if(edl)