allow multiple edits for edit user title update

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

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 5fde46cc777d3ecf986554ba31354881e8af0591..77c1eba14aa08c97aa73e8467273b4dc017c4333 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -3292,6 +3292,14 @@ void MWindow::hide_keyframe_gui(Plugin *plugin)
        keyframe_gui_lock->unlock();
 }
 
+int MWindow::get_title_color(Edit *edit)
+{
+        int color = edit->color;
+       if( color < 0 && preferences->autocolor_assets )
+               color = edit->get_hash_color();
+       return color;
+}
+
 void MWindow::update_keyframe_guis()
 {
 // Send new configuration to keyframe GUI's
@@ -4011,9 +4019,7 @@ void MWindow::remove_asset_from_caches(Asset *asset)
 void MWindow::remove_assets_from_project(int push_undo, int redraw,
                ArrayList<Indexable*> *drag_assets, ArrayList<EDL*> *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 +4078,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)