RT #126029: sink MAIN (and USAGE)

rakudo · Sep 19, 2015 · f7c2a72 · f7c2a72
1 parent a5ef61e
commit f7c2a72
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/core/Main.pm b/src/core/Main.pm
@@ -129,13 +129,17 @@ my sub MAIN_HELPER($retval = 0) {
     @matching_candidates .=grep: {!has-unexpected-named-arguments($_.signature, $n)};
     # If there are still some candidates left, try to dispatch to MAIN
     if +@matching_candidates {
-        return $m(|@($p), |%($n));
+        $m(|@($p), |%($n));
+        return;
     }
 
     # We could not find the correct MAIN to dispatch to!
     # Let's try to run a user defined USAGE sub
     my $h = callframe(1).my<&USAGE>;
-    return $h() if $h;
+    if $h {
+        $h();
+        return;
+    }
 
     # We could not find a user defined USAGE sub!
     # Let's display the default USAGE message