X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fassetpopup.C;h=15620af7a34c35f0f5d4950a445fe0dc5fbec782;hb=86bd203ac1fc29d93f63d13e2979468f06bdc3a2;hp=07cc8eb4dd1ded8c0f336bd1616bce654247bd32;hpb=404606b5c3b61c130942879de8bf4c4c95854cb0;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index 07cc8eb4..15620af7 100644
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -100,10 +100,11 @@ void AssetPopup::paste_assets()
 	mwindow->gui->lock_window("AssetPopup::paste_assets");
 	mwindow->cwindow->gui->lock_window("AssetPopup::paste_assets");
 
-	gui->collect_assets();
+	int proxy = mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ? 1 : 0;
+	gui->collect_assets(proxy);
 	mwindow->paste_assets(mwindow->edl->local_session->get_selectionstart(1),
-		mwindow->edl->tracks->first,
-		0);   // do not overwrite
+		mwindow->edl->tracks->first, 0);   // do not overwrite
+	mwindow->session->clear_drag_proxy();
 
 	gui->unlock_window();
 	mwindow->gui->unlock_window();
@@ -140,7 +141,8 @@ void AssetPopup::match_all()
 int AssetPopup::update()
 {
 	format->update();
-	gui->collect_assets();
+	int proxy = mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ? 1 : 0;
+	gui->collect_assets(proxy);
 	return 0;
 }