update ru.po/andrew, edge gui init fix, dual monitor root coords tweaks, rm debug...

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

diff --git a/cinelerra-5.1/cinelerra/mainsession.C b/cinelerra-5.1/cinelerra/mainsession.C
index 555a872e0b34667cb2e6322f61a9343f0a667200..de63b8b112b03ac399d6484499a6460d6d15e1c0 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainsession.C
+++ b/cinelerra-5.1/cinelerra/mainsession.C
@@ -110,6 +110,7 @@ MainSession::MainSession(MWindow *mwindow)
        use_vect_gain = 5;
        use_smooth = 0;
        use_refresh = 0;
+       use_release = 0;
        use_graticule = 0;
        afolders_w = 0;
        show_vwindow = show_awindow = show_cwindow = show_gwindow = show_lwindow = 0;
@@ -220,17 +221,18 @@ void MainSession::default_window_positions(int window_config)
                        }
                }
                if( left_w > 0 ) {
+                       int min_x = INT_MAX;
                        for( int s=0; s<xin_screens; ++s ) {
                                if( display_info.xinerama_geometry(s, x, y, w, h) )
                                        continue;
-                               if( !y && x == left_w ) {
+                               if( !y && x >= left_w && x < min_x ) {
+                                       min_x = x;
                                        right_w = w;
                                        screens = 2;
-                                       break;
                                }
                        }
                        if( window_config == 1 ) {
-                               root_x = left_w;
+                               root_x = min_x;
                                root_w = right_w;
                        }
                        else {
@@ -330,6 +332,7 @@ void MainSession::default_window_positions(int window_config)
        use_vect_gain = 5;
        use_smooth = 1;
        use_refresh = 0;
+       use_release = 0;
        use_graticule = 0;
 
        if(mwindow->edl)
@@ -449,6 +452,7 @@ int MainSession::load_defaults(BC_Hash *defaults)
        use_vect_gain = defaults->get("USE_VECT_GAIN", use_vect_gain);
        use_smooth = defaults->get("USE_SMOOTH", use_smooth);
        use_refresh = defaults->get("USE_REFRESH", use_refresh);
+       use_release = defaults->get("USE_RELEASE", use_release);
        use_graticule = defaults->get("USE_GRATICULE", use_graticule);
 
 //printf("MainSession::load_defaults 1\n");
@@ -579,6 +583,7 @@ int MainSession::save_defaults(BC_Hash *defaults)
        defaults->update("USE_VECT_GAIN", use_vect_gain);
        defaults->update("USE_SMOOTH", use_smooth);
        defaults->update("USE_REFRESH", use_refresh);
+       defaults->update("USE_RELEASE", use_release);
        defaults->update("USE_GRATICULE", use_graticule);
 
        defaults->update("ABINS_W", afolders_w);