[macruby-changes] [4468] MacRuby/trunk/vm.cpp

[source_changes at macosforge.org]

Revision: 4468
          http://trac.macosforge.org/projects/ruby/changeset/4468
Author:   joshua.ballanco at apple.com
Date:     2010-08-26 13:43:06 -0700 (Thu, 26 Aug 2010)
Log Message:
-----------
Fixes multiple feature requires

Modified Paths:
--------------
    MacRuby/trunk/vm.cpp

Modified: MacRuby/trunk/vm.cpp
===================================================================
--- MacRuby/trunk/vm.cpp	2010-08-25 23:45:27 UTC (rev 4467)
+++ MacRuby/trunk/vm.cpp	2010-08-26 20:43:06 UTC (rev 4468)
@@ -5019,8 +5019,10 @@
 	return false;
     }
     void *init_func = iter->second;
-    ((void *(*)(void *, void *))init_func)((void *)rb_vm_top_self(), NULL);
-    aot_features.erase(iter);
+    if (init_func != NULL) {
+        ((void *(*)(void *, void *))init_func)((void *)rb_vm_top_self(), NULL);
+        iter->second = NULL;
+    }
     return true;
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100826/b0e8c15a/attachment.html>