add clip folders, icon margins, fix safe regions, update neophyte, fix folder edl...

[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 953a794bed6267ebcdb4fc87761b434d8657ff4b..59e13131507e0b2cbcb685078069de58cd25744c 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -100,11 +100,9 @@ void AssetPopup::paste_assets()
        mwindow->gui->lock_window("AssetPopup::paste_assets");
        mwindow->cwindow->gui->lock_window("AssetPopup::paste_assets");
 
-       int proxy = mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ? 1 : 0;
-       gui->collect_assets(proxy);
+       gui->collect_assets();
        mwindow->paste_assets(mwindow->edl->local_session->get_selectionstart(1),
                mwindow->edl->tracks->first, 0);   // do not overwrite
-       mwindow->session->clear_drag_proxy();
 
        gui->unlock_window();
        mwindow->gui->unlock_window();
@@ -141,8 +139,7 @@ void AssetPopup::match_all()
 int AssetPopup::update()
 {
        format->update();
-       int proxy = mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ? 1 : 0;
-       gui->collect_assets(proxy);
+       gui->collect_assets();
        return 0;
 }