X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=91239c408309d8e00b185bd2f6bccede29cbbbc4;hp=52b77876f8f65b143d840aaa77e6198b124a6b20;hb=16b7c476167d91c4c6805ddb6c23be7206c62bd2;hpb=2f5cb0703a06e037f2521ba220242a937d0e35b9

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 52b7787..91239c4 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1055,10 +1055,11 @@ EOF
     }
 
     # Call plugins setup, this is stupid and evil.
+    # Also screws C3 badly on 5.10, hack to avoid.
     {
         no warnings qw/redefine/;
         local *setup = sub { };
-        $class->setup;
+        $class->setup unless $Catalyst::__AM_RESTARTING;
     }
 
     # Initialize our data structure