X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xs-src%2FMouseUtil.xs;h=e56274888ec9e2d365df1d5cff74444e5a479f62;hb=9a87d68a97aa8d1dd0d14c1e63c0edcd03f0a13a;hp=5b01e404c0d56e99c0f45b6451c0d2e1954fa2e3;hpb=b3cd4c14b73eb0160d29f7d76828de0060c0b522;p=gitmo%2FMouse.git

diff --git a/xs-src/MouseUtil.xs b/xs-src/MouseUtil.xs
index 5b01e40..e562748 100644
--- a/xs-src/MouseUtil.xs
+++ b/xs-src/MouseUtil.xs
@@ -123,12 +123,13 @@ mouse_throw_error(SV* const metaobject, SV* const data /* not used */, const cha
 /* workaround RT #69939 */
 I32
 mouse_call_sv_safe(pTHX_ SV* const sv, I32 const flags) {
+    const PERL_CONTEXT* const cx = &cxstack[cxstack_ix];
     assert( (flags & G_EVAL) == 0 );
-
-    if(!PL_in_eval) {
+    //warn("%d 0x%x 0x%x", (int)cx->cx_type, (int)cx->cx_type, (int)PL_in_eval);
+    if(!(cx->cx_type & (CXt_EVAL|CXp_TRYBLOCK))) {
         I32 count;
-        SAVESPTR(ERRSV);
-        ERRSV = sv_newmortal();
+        //SAVESPTR(ERRSV);
+        //ERRSV = sv_newmortal();
 
         count = Perl_call_sv(aTHX_ sv, flags | G_EVAL);