X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fassetpopup.C;h=fe52bbd6936336a0ac2a848ae37606f0cac296e7;hb=5ac2037d8e5ab71a1915389cd08b458cfb60d64f;hp=59e13131507e0b2cbcb685078069de58cd25744c;hpb=a95193c3fd88733d184f2d460eca1fe6ddf8af28;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index 59e13131..fe52bbd6 100644
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -100,7 +100,8 @@ 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
 
@@ -139,7 +140,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;
 }