Mercurial > octave

changeset 29096:c5ccb3d2be81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author John W. Eaton <jwe@octave.org>
date Tue, 24 Nov 2020 20:34:02 -0500
parents d09dde091073 (current diff) f8c6660f2ccc (diff)
children 00baf82bf56e
files libgui/src/main-window.cc
diffstat 1 files changed, 1 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Tue Nov 24 14:14:58 2020 +0100
+++ b/libgui/src/main-window.cc	Tue Nov 24 20:34:02 2020 -0500
@@ -1596,19 +1596,8 @@
           }
       }
 
-    if (settings)
+    if (! settings)
       {
-        // Restore main window state and geometry after creating all
-        // dock widgets
-        if (! restoreState (settings->value (mw_state).toByteArray ()))
-          restoreState (mw_state.def.toByteArray ());
-
-        if (! restoreGeometry (settings->value (mw_geometry).toByteArray ()))
-          restoreGeometry (mw_geometry.def.toByteArray ());
-      }
-    else
-      {
-        // Reset to the initial window layout and size
         restoreGeometry (mw_geometry.def.toByteArray ());
         restoreState (mw_state.def.toByteArray ());