Mercurial > octave

changeset 27693:de4bfeda8d9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not call main_loop in embedded interpreter (bug #57229) * interpreter.cc (interpreter::execute): Do not call main_loop when m_app_context is null. * embedded.cc: Fix comment demonstrating interpreter::initialize.
author Mike Miller <mtmiller@octave.org>
date Thu, 14 Nov 2019 13:15:31 -0800
parents e557774a2604
children b3401292e101
files examples/code/embedded.cc libinterp/corefcn/interpreter.cc
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/examples/code/embedded.cc	Thu Nov 14 14:06:04 2019 -0800
+++ b/examples/code/embedded.cc	Thu Nov 14 13:15:31 2019 -0800
@@ -24,7 +24,7 @@
       // Perform final initialization of interpreter, including
       // executing commands from startup files by calling
       //
-      //   int status interpreter.initialize ();
+      //   interpreter.initialize ();
       //
       //   if (! interpreter.initialized ())
       //     {
--- a/libinterp/corefcn/interpreter.cc	Thu Nov 14 14:06:04 2019 -0800
+++ b/libinterp/corefcn/interpreter.cc	Thu Nov 14 13:15:31 2019 -0800
@@ -791,9 +791,9 @@
 
             if (options.forced_interactive ())
               command_editor::blink_matching_paren (false);
+
+            exit_status = main_loop ();
           }
-
-        return main_loop ();
       }
     catch (const exit_exception& ex)
       {