Mercurial > octave

changeset 30741:496e5214c609

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 Sun, 13 Feb 2022 12:47:36 -0500
parents e022eab3ea1b (current diff) d6ca77706ab3 (diff)
children e393ba9ab5d2
files libgui/src/main-window.cc
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Sat Feb 12 16:23:34 2022 -0500
+++ b/libgui/src/main-window.cc	Sun Feb 13 12:47:36 2022 -0500
@@ -1984,7 +1984,8 @@
 
         e->ignore ();
 
-        if (m_octave_qobj.experimental_terminal_widget ())
+        if (m_octave_qobj.experimental_terminal_widget ()
+            && ! m_octave_qobj.is_gui_app ())
           emit close_gui_signal ();
         else
           {
--- a/libgui/src/octave-qobject.h	Sat Feb 12 16:23:34 2022 -0500
+++ b/libgui/src/octave-qobject.h	Sun Feb 13 12:47:36 2022 -0500
@@ -201,6 +201,8 @@
 
     virtual bool confirm_shutdown (void);
 
+    bool is_gui_app (void) const { return m_gui_app; }
+
     template <typename T> void connect_interpreter_events (T *widget)
     {
       connect (widget, QOverload<const fcn_callback&>::of (&T::interpreter_event),