1 files changed, 4 insertions, 11 deletions

diff --git a/src/FbTk/LuaUtil.hh b/src/FbTk/LuaUtil.hh
index d013ed9..12a687e 100644
--- a/src/FbTk/LuaUtil.hh
+++ b/src/FbTk/LuaUtil.hh
@@ -53,9 +53,11 @@ public:
      */
     void readOnlySet(int index);
 
+    typedef Slot<void, Lua &> InitFunction;
+
     template<typename Functor>
     static void registerInitFunction(const Functor &fn) {
-        s_init_functions.push_back(new SlotImpl<Functor, void, Lua &>(fn));
+        doRegisterInitFunction(std::auto_ptr<InitFunction>(new SlotImpl<Functor, void, Lua &>(fn)));
     }
 
     class RegisterInitFunction {
@@ -67,16 +69,7 @@ public:
     };
 
 private:
-    typedef Slot<void, Lua &> InitFunction;
-    struct AutoVector: public std::vector<InitFunction *> {
-        ~AutoVector() {
-            for(iterator it = begin(); it != end(); ++it)
-                delete *it;
-        }
-    };
-    typedef AutoVector InitFunctions;
-
-    static InitFunctions s_init_functions;
+    static void doRegisterInitFunction(std::auto_ptr<InitFunction> fn);
 };
 
 } // namespace FbTk