vicon drawing segv fix, beeper consolidation, render_effect resize wdw fix, valgrind...

[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 e0a8a8265f57752e73b347788500a9f8b4a3b116..5862b9432f7dfd27b5e7a2a09ea46cca9c959933 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainsession.C
+++ b/cinelerra-5.1/cinelerra/mainsession.C
@@ -368,8 +368,12 @@ void MainSession::default_window_positions(int window_config)
 int MainSession::load_defaults(BC_Hash *defaults)
 {
 // Setup main windows
-       strcpy(a_x11_host, defaults->get("A_X11_HOST", a_x11_host));
-       strcpy(b_x11_host, defaults->get("B_X11_HOST", b_x11_host));
+       char *a_host = defaults->get("A_X11_HOST", a_x11_host);
+       if( a_host != a_x11_host )
+               strcpy(a_x11_host, defaults->get("A_X11_HOST", a_x11_host));
+       char *b_host = defaults->get("B_X11_HOST", b_x11_host);
+       if( b_host != b_x11_host )
+               strcpy(b_x11_host, defaults->get("B_X11_HOST", b_x11_host));
        window_config = defaults->get("WINDOW_CONFIG", window_config);
        default_window_positions(window_config);