rework histogram_bezier, init wm icon set_icon(gg), update de.po+msg/txt

[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 59e13131507e0b2cbcb685078069de58cd25744c..c9bac6fd1d9bbae4dda377d2e0493703ae6dc4cc 100644 (file)
--- 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;
 }
 
@@ -821,7 +823,7 @@ int SnapshotMenuItem::handle_event()
                file.close_file();
        }
        if( !ret ) {
-               asset->awindow_folder = AW_MEDIA_FOLDER;
+               asset->folder_no = AW_MEDIA_FOLDER;
                mwindow->edl->assets->append(asset);
                mwindow->awindow->gui->async_update_assets();
        }
@@ -1042,7 +1044,7 @@ int GrabshotPopup::grab_event(XEvent *event)
                file.close_file();
        }
        if( !ret ) {
-               asset->awindow_folder = AW_MEDIA_FOLDER;
+               asset->folder_no = AW_MEDIA_FOLDER;
                mwindow->edl->assets->append(asset);
                mwindow->awindow->gui->async_update_assets();
        }