changeset 22719:5654429b6d7e

maint: Periodic merge of stable to default.
author Mike Miller <mtmiller@octave.org>
date Thu, 03 Nov 2016 10:35:03 -0700
parents f0b4e3903f7f (current diff) d9bec44ffaff (diff)
children 0cd8a1c22f23
files
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/interpreter.cc	Thu Nov 03 10:06:40 2016 -0700
+++ b/libinterp/corefcn/interpreter.cc	Thu Nov 03 10:35:03 2016 -0700
@@ -1070,15 +1070,17 @@
         else
           {
             // What should we do here?  We might be called from some
-            // location other than the end of octave_execute_interpreter,
+            // location other than the end of octave::interpreter::execute
             // so it might not be safe to return.
 
             // We have nothing else to do at this point, and the
             // octave_link::exit function is supposed to take care of
-            // exiting for us.  Assume that job won't take more than a
-            // day...
+            // exiting for us.  Hang here forever so we never return.
 
-            octave_sleep (86400); // FIXME: really needed?
+            while (true)
+              {
+                octave_sleep (1);
+              }
           }
       }
     else