shuttle keydef tweak, add copy_flags to copy edl, zoombar layout tweak

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / clippopup.C

diff --git a/cinelerra-5.1/cinelerra/clippopup.C b/cinelerra-5.1/cinelerra/clippopup.C
index 4027b8190a148b75898b637e4ca89820fd40d7d4..595155c0d8440c9fd5fc06c2bf28f8a618ae7477 100644 (file)
--- a/cinelerra-5.1/cinelerra/clippopup.C
+++ b/cinelerra-5.1/cinelerra/clippopup.C
@@ -257,7 +257,7 @@ int ClipPopupCopy::handle_event()
                copy_edl->copy_all(edl);
                FileXML file;
                double start = 0, end = edl->tracks->total_length();
-               copy_edl->copy(start, end, 1, &file, "", 1);
+               copy_edl->copy(COPY_EDL, start, end, &file, "", 1);
                copy_edl->remove_user();
                const char *file_string = file.string();
                long file_length = strlen(file_string);
@@ -343,9 +343,11 @@ ClipPopupDelete::~ClipPopupDelete()
 
 int ClipPopupDelete::handle_event()
 {
+       popup->gui->unlock_window();
        mwindow->remove_assets_from_project(1, 1,
                mwindow->session->drag_assets,
                mwindow->session->drag_clips);
+       popup->gui->lock_window("ClipPopupDelete::handle_event");
        return 1;
 }