Mercurial > octave
changeset 23613:702db65be195
maint: Merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 15 Jun 2017 19:38:45 -0400 |
parents | 91c8f006ed8b (current diff) fecca33388f7 (diff) |
children | 7a97944f06e5 |
files | libinterp/parse-tree/pt-eval.cc |
diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-eval.cc Thu Jun 15 19:15:06 2017 -0400 +++ b/libinterp/parse-tree/pt-eval.cc Thu Jun 15 19:38:45 2017 -0400 @@ -2403,6 +2403,13 @@ // exception will be thrown instead of the original. throw; } + catch (const octave::interrupt_exception&) + { + // The comments above apply here as well. + recover_from_exception (); + do_unwind_protect_cleanup_code (cleanup_code); + throw; + } // Also execute the unwind_protect_cleanump code if the // unwind_protect block runs without error.