# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1653737869 -7200
# Node ID 0ee18536ec5cd1302c9f310f88d7ed5393186c1b
# Parent  39ca6d0b63e4b02387746b7e8aa11cfd549aeed0# Parent  ecb867dfc8eb96ef0917884e959b397ca7f81aff
maint: Merge stable to default.

diff -r 39ca6d0b63e4 -r 0ee18536ec5c libinterp/corefcn/interpreter.cc
--- a/libinterp/corefcn/interpreter.cc	Fri May 27 07:58:36 2022 -0700
+++ b/libinterp/corefcn/interpreter.cc	Sat May 28 13:37:49 2022 +0200
@@ -659,6 +659,9 @@
 
   interpreter::~interpreter (void)
   {
+    if (! m_app_context)
+      shutdown ();
+
     delete m_gh_manager;
   }
 
@@ -911,15 +914,17 @@
               }
             else
               exit_status = main_loop ();
+
+            shutdown ();
           }
       }
     catch (const exit_exception& xe)
       {
         exit_status = xe.exit_status ();
+
+        shutdown ();
       }
 
-    shutdown ();
-
     return exit_status;
   }