X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=a84e11a16f725d464c8cd3eb6c2660abac607854;hb=c98ecabef4f08c66ad7dbd3004cf7995e012dc3e;hp=5fde46cc777d3ecf986554ba31354881e8af0591;hpb=24d62aadcd7a6188aff573aaec22f31e3bba4a57;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index 5fde46cc..a84e11a1 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -4011,9 +4011,7 @@ void MWindow::remove_asset_from_caches(Asset *asset) void MWindow::remove_assets_from_project(int push_undo, int redraw, ArrayList *drag_assets, ArrayList *drag_clips) { - awindow->gui->vicon_thread->stop_drawing(); - awindow->gui->vicon_thread->drawing_started(); // waits for draw lock - awindow->gui->vicon_thread->drawing_stopped(); + awindow->gui->close_view_popup(); for(int i = 0; i < drag_assets->total; i++) { Indexable *indexable = drag_assets->get(i); @@ -4072,16 +4070,16 @@ void MWindow::remove_assets_from_project(int push_undo, int redraw, void MWindow::remove_assets_from_disk() { + remove_assets_from_project(1, + 1, + session->drag_assets, + session->drag_clips); + // Remove from disk for(int i = 0; i < session->drag_assets->total; i++) { remove(session->drag_assets->get(i)->path); } - - remove_assets_from_project(1, - 1, - session->drag_assets, - session->drag_clips); } void MWindow::dump_plugins(FILE *fp)