Mercurial > octave

changeset 29448:b8704da94c1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Sat, 20 Mar 2021 09:18:49 +0900
parents 435fc29162c0 (current diff) f526f28f1aa4 (diff)
children 3a680307d4aa
files libgui/src/main-window.cc
diffstat 1 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Wed Mar 17 00:50:34 2021 -0400
+++ b/libgui/src/main-window.cc	Sat Mar 20 09:18:49 2021 +0900
@@ -1679,22 +1679,19 @@
 
     if (settings)
       {
-        if (settings->value (global_restore_ov_dir.key,
-                             global_restore_ov_dir.def).toBool ())
+        if (settings->value (global_restore_ov_dir).toBool ())
           {
             // restore last dir from previous session
             QStringList curr_dirs
               = settings->value (mw_dir_list).toStringList ();
-            startup_dir
-              = QDir (curr_dirs.at (0));  // last dir in previous session
+            if (curr_dirs.length () > 0)
+              startup_dir = QDir (curr_dirs.at (0));  // last dir prev. session
           }
-        else if (! settings->value (global_ov_startup_dir.key,
-                                    global_ov_startup_dir.def).toString ().isEmpty ())
+        else if (! settings->value (global_ov_startup_dir).toString ().isEmpty ())
           {
             // do not restore but there is a startup dir configured
             startup_dir
-              = QDir (settings->value (global_ov_startup_dir.key,
-                                       global_ov_startup_dir.def).toString ());
+              = QDir (settings->value (global_ov_startup_dir).toString ());
           }
 
         update_default_encoding (settings->value (ed_default_enc).toString ());