Only set dispatcher if there is one to set.

Raku · Jun 30, 2013 · 2cb852a · 2cb852a
1 parent 9fca92f
commit 2cb852a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java b/src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java
@@ -3503,8 +3503,10 @@ public static SixModelObject getstaticcode(SixModelObject code, ThreadContext tc
             throw ExceptionHandling.dieInternal(tc, "getstaticcode can only be used with a CodeRef");
     }
     public static void takedispatcher(int lexIdx, ThreadContext tc) {
-        tc.curFrame.oLex[lexIdx] = tc.currentDispatcher;
-        tc.currentDispatcher = null;
+        if (tc.currentDispatcher != null) {
+            tc.curFrame.oLex[lexIdx] = tc.currentDispatcher;
+            tc.currentDispatcher = null;
+        }
     }
 
     /* process related opcodes */