# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1644317729 -3600
# Node ID 0cf7727329811cf4d65d32f09d68c17cbd0be298
# Parent  53b125563b49a063b7f9a63507bee70779f12342# Parent  0a082e1b7422ac418883b1c76e0800472dd72c14
maint: Merge stable to default.

diff -r 53b125563b49 -r 0cf772732981 libgui/src/main-window.cc
--- a/libgui/src/main-window.cc	Tue Feb 08 11:54:36 2022 +0100
+++ b/libgui/src/main-window.cc	Tue Feb 08 11:55:29 2022 +0100
@@ -467,6 +467,11 @@
     // close the main window without exiting the application.
     connect (qApp, &QApplication::aboutToQuit,
              dw, &octave_dock_widget::save_settings);
+
+    // The following is required when the exp. terminal widget is used
+    // and the main window is closed (no exit via interpreter)
+    connect (this, &main_window::close_gui_signal,
+             dw, &octave_dock_widget::save_settings);
   }
 
   bool main_window::command_window_has_focus (void) const
diff -r 53b125563b49 -r 0cf772732981 libgui/src/octave-dock-widget.h
--- a/libgui/src/octave-dock-widget.h	Tue Feb 08 11:54:36 2022 +0100
+++ b/libgui/src/octave-dock-widget.h	Tue Feb 08 11:55:29 2022 +0100
@@ -128,14 +128,14 @@
 
     virtual void notice_settings (const gui_settings *) { }
 
+    virtual void save_settings (void);
+
     void init_window_menu_entry (void);
 
     void handle_settings (const gui_settings *);
 
     void handle_active_dock_changed (octave_dock_widget *, octave_dock_widget *);
 
-    void save_settings (void);
-
     void moveEvent (QMoveEvent *event);
 
     void resizeEvent (QResizeEvent *event);