Mercurial > octave

changeset 23104:2805cc365a86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix thinko in previous change * interpreter.cc (interpreter::execute_internal): Simply call main_loop and return its status. (main_loop): Return early with 0 status for success if m_embedded is true.
author John W. Eaton <jwe@octave.org>
date Fri, 27 Jan 2017 12:56:33 -0500
parents 09c72a320925
children 3b58b08d764a
files libinterp/corefcn/interpreter.cc
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/interpreter.cc	Fri Jan 27 12:27:11 2017 -0500
+++ b/libinterp/corefcn/interpreter.cc	Fri Jan 27 12:56:33 2017 -0500
@@ -624,7 +624,7 @@
         Fecho_executing_commands (octave_value (ECHO_CMD_LINE));
       }
 
-    return m_embedded ? main_loop () : 1;
+    return main_loop ();
   }
 
   void interpreter::display_startup_message (void) const
@@ -840,6 +840,9 @@
 
   int interpreter::main_loop (void)
   {
+    if (m_embedded)
+      return 0;
+
     octave_save_signal_mask ();
 
     octave::can_interrupt = true;