Mercurial > octave-nkf

changeset 10069:c670c8be7f93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix incorrect octave_interrupt_state escaped from liboctave
author Jaroslav Hajek <highegg@gmail.com>
date Thu, 07 Jan 2010 08:29:02 +0100
parents ca93f583573d
children 897e62651c0a
files libcruft/ChangeLog libcruft/misc/quit.cc
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libcruft/ChangeLog	Thu Jan 07 07:58:23 2010 +0100
+++ b/libcruft/ChangeLog	Thu Jan 07 08:29:02 2010 +0100
@@ -1,3 +1,8 @@
+2010-01-07  Jaroslav Hajek  <highegg@gmail.com>
+
+	* misc/quit.cc (octave_rethrow_exception): Set octave_interrupt_state
+	to -1 when throwing octave_interrupt_exception.
+
 2010-01-05  John W. Eaton  <jwe@octave.org>
 
 	* Makefile.am (AM_CPPFLAGS): New variable.
--- a/libcruft/misc/quit.cc	Thu Jan 07 07:58:23 2010 +0100
+++ b/libcruft/misc/quit.cc	Thu Jan 07 08:29:02 2010 +0100
@@ -82,7 +82,10 @@
 octave_rethrow_exception (void)
 {
   if (octave_interrupt_state)
-    octave_throw_interrupt_exception ();
+    {
+      octave_interrupt_state = -1;
+      octave_throw_interrupt_exception ();
+    }
   else
     {
       switch (octave_exception_state)