Merge https://github.com/angavrilov/dfhack

2012-03-28 19:53:10 +02:00 · 2012-03-28 19:53:10 +02:00 · 6235d2e801
parent 6ea0d810bb e4e643f9d2
commit 6235d2e801
1 changed files with 2 additions and 0 deletions
--- a/library/PluginManager.cpp
+++ b/library/PluginManager.cpp
@ -212,6 +212,7 @@ bool Plugin::load(color_ostream &con)
    plugin_rpcconnect = (RPCService* (*)(color_ostream &)) LookupPlugin(plug, "plugin_rpcconnect");
    this->name = *plug_name;
    plugin_lib = plug;
+    commands.clear();
    if(plugin_init(con,commands) == CR_OK)
    {
        state = PS_LOADED;
@ -242,6 +243,7 @@ bool Plugin::unload(color_ostream &con)
        access->wait();
        // cleanup...
        parent->unregisterCommands(this);
+        commands.clear();
        if(cr == CR_OK)
        {
            ClosePlugin(plugin_lib);