always run :load subs, no matter how something has been loaded

parrot · Dec 30, 2010 · 51ac88d · 51ac88d
1 parent 4896bc7
commit 51ac88d
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/packfile/api.c b/src/packfile/api.c
@@ -734,12 +734,11 @@ do_1_sub_pragma(PARROT_INTERP, ARGMOD(PMC *sub_pmc), pbc_action_enum_t action)
         break;
 
       case PBC_MAIN:
-        /* run :init tagged functions */
-        if (Sub_comp_INIT_TEST(sub)) {
-            /* if loaded no need for init */
+        /* run :init/:load tagged functions */
+        if (Sub_comp_INIT_TEST(sub)
+        ||  PObj_get_FLAGS(sub_pmc) & SUB_FLAG_PF_LOAD) {
+            /* only run :init/:load subs once */
             Sub_comp_INIT_CLEAR(sub);
-
-            /* if inited no need for load */
             PObj_get_FLAGS(sub_pmc) &= ~SUB_FLAG_PF_LOAD;
 
             run_sub(interp, sub_pmc);