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

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

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 8a33473c81a999c167953800ef8f569ebf9a427d..c1cd79f6119ff4e027a804bc7d828b2ae72d9d80 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -3470,12 +3470,14 @@ void MWindow::update_project(int load_mode)
 
        if(debug) PRINT_TRACE
        edl->tracks->update_y_pixels(theme);
+       session->update_clip_number();
 
        if(debug) PRINT_TRACE
 
-       if(load_mode == LOADMODE_REPLACE ||
-               load_mode == LOADMODE_REPLACE_CONCATENATE)
-       {
+       if( load_mode == LOADMODE_REPLACE ||
+           load_mode == LOADMODE_REPLACE_CONCATENATE ) {
+               delete gui->keyvalue_popup;
+               gui->keyvalue_popup = 0;
                gui->load_panes();
        }
 
@@ -3524,16 +3526,7 @@ void MWindow::update_project(int load_mode)
                        zwindow->start();
                }
        }
-       else {
-               if(vwindows.size()) {
-                       VWindow *vwindow = vwindows[DEFAULT_VWINDOW];
-                       if( vwindow->is_running() ) {
-                               vwindow->gui->lock_window("MWindow::update_project");
-                               vwindow->update(1);
-                               vwindow->gui->unlock_window();
-                       }
-               }
-       }
+       update_vwindow();
 
        if(debug) PRINT_TRACE
        cwindow->gui->lock_window("MWindow::update_project 2");
@@ -3552,6 +3545,18 @@ void MWindow::update_project(int load_mode)
        if(debug) PRINT_TRACE
 }
 
+void MWindow::update_vwindow()
+{
+       for( int i=0; i<vwindows.size(); ++i ) {
+               VWindow *vwindow = vwindows[i];
+               if( vwindow->is_running() ) {
+                       vwindow->gui->lock_window("MWindow::update_vwindow");
+                       vwindow->update(1);
+                       vwindow->gui->unlock_window();
+               }
+       }
+}
+
 void MWindow::remove_indexfile(Indexable *indexable)
 {
        if( !indexable->is_asset ) return;