undo fixes, viewer change_source rework, cleanup

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

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index 1afb19e4580940c2b98b1d20a19755f19b3d1fc7..238a73c694addb15f8685ecf71a89ef4971ba8ce 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -241,7 +241,6 @@ AssetPopupView::~AssetPopupView()
 int AssetPopupView::handle_event()
 {
        VWindow *vwindow = mwindow->get_viewer(1, DEFAULT_VWINDOW);
-       vwindow->gui->lock_window("AssetPopupView::handle_event");
 
        if( mwindow->session->drag_assets->total )
                vwindow->change_source(
@@ -251,7 +250,6 @@ int AssetPopupView::handle_event()
                vwindow->change_source(
                        mwindow->session->drag_clips->values[0]);
 
-       vwindow->gui->unlock_window();
        return 1;
 }
 
@@ -273,8 +271,6 @@ int AssetPopupViewWindow::handle_event()
        VWindow *vwindow = mwindow->get_viewer(1);
 
 // TODO: create new vwindow or change current vwindow
-       vwindow->gui->lock_window("AssetPopupView::handle_event");
-
        if( mwindow->session->drag_assets->total )
                vwindow->change_source(
                        mwindow->session->drag_assets->values[0]);
@@ -283,7 +279,6 @@ int AssetPopupViewWindow::handle_event()
                vwindow->change_source(
                        mwindow->session->drag_clips->values[0]);
 
-       vwindow->gui->unlock_window();
        return 1;
 }