changeset 23095:5a8979c8d0c3

call octave_quit after return from "foreign" code * quit.h (END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE): Call octave_quit.
author John W. Eaton <jwe@octave.org>
date Thu, 26 Jan 2017 17:06:39 -0500
parents 28c9a42cfbf8
children b7a24a734c37
files liboctave/cruft/misc/quit.h
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/cruft/misc/quit.h	Thu Jan 26 13:09:13 2017 -0500
+++ b/liboctave/cruft/misc/quit.h	Thu Jan 26 17:06:39 2017 -0500
@@ -255,16 +255,17 @@
           octave_restore_current_context (saved_context)
 
 #define BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE_2   \
-  }                                                     \
+        }                                               \
       else                                              \
         {                                               \
-  octave_interrupt_immediately++
+          octave_interrupt_immediately++
 
-#define END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE       \
-  octave_interrupt_immediately--;                       \
-  octave_restore_current_context (saved_context);       \
-}                                                       \
-}                                                       \
+#define END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE               \
+          octave_interrupt_immediately--;                       \
+          octave_restore_current_context (saved_context);       \
+          octave_quit ();                                       \
+        }                                                       \
+    }                                                           \
   while (0)
 
 #if defined (__cplusplus)