p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...

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

diff --git a/cinelerra-5.1/cinelerra/proxy.C b/cinelerra-5.1/cinelerra/proxy.C
index 45feb5951354a36d5e668f73080483ddc6ababba..420592ea7e7ec7268928f51a687ff9e8b7d70615 100644 (file)
--- a/cinelerra-5.1/cinelerra/proxy.C
+++ b/cinelerra-5.1/cinelerra/proxy.C
@@ -165,12 +165,14 @@ void ProxyDialog::handle_close_event(int result)
                eprintf("Specified format does not render video");
                return;
        }
-       mwindow->edl->session->proxy_use_scaler = use_scaler;
        mwindow->edl->session->proxy_auto_scale = auto_scale;
        mwindow->edl->session->proxy_beep = beep;
        mwindow->edl->session->proxy_disabled_scale = 1;
+       mwindow->gui->lock_window("ProxyDialog::handle_close_event");
+       mwindow->gui->update_proxy_toggle();
+       mwindow->gui->unlock_window();
        asset->save_defaults(mwindow->defaults, "PROXY_", 1, 1, 0, 0, 0); 
-       result = mwindow->to_proxy(asset, new_scale);
+       result = mwindow->to_proxy(asset, new_scale, use_scaler);
        if( result >= 0 && beep && new_scale != 1 ) {
                static struct { double freq, secs, gain; }
                    tone[2] = { { 2000., 1.5, 0.5 }, { 4000., 0.25, 0.5 } };