diff -r 0adfab7ecca7 -r 81b14823a2c3 sourcemm/CPlugin.cpp --- a/sourcemm/CPlugin.cpp Sat Jun 25 12:55:26 2005 +0000 +++ b/sourcemm/CPlugin.cpp Sun Jun 26 19:15:24 2005 +0000 @@ -30,11 +30,11 @@ CPluginManager::~CPluginManager() { - if (m_Plugins.size()) + /*if (m_Plugins.size()) { UnloadAll(); m_Plugins.clear(); - } + }*/ } CPluginManager::CPlugin::CPlugin() : m_Lib(NULL), m_API(NULL), m_Id(0), m_Source(0) @@ -388,30 +388,23 @@ bool CPluginManager::UnloadAll() { PluginIter i; - bool status = true; + + std::list remqueue; for (i=m_Plugins.begin(); i!=m_Plugins.end(); i++) - { - if ( (*i) ) - { - if ( (*i)->m_API ) - { - if ( !(*i)->m_API->Unload(NULL, 0) ) - status = false; + remqueue.push_back( (*i) ); + + char error[128]; + bool status = true; - UnregAllConCmds( (*i) ); - - //Unlink from SourceHook - g_SourceHook.UnloadPlugin( (*i)->m_Id ); - - //Free the DLL - dlclose( (*i)->m_Lib ); - } - delete (*i); - } + for (i=remqueue.begin(); i!=remqueue.end(); i++) + { + if ( !_Unload( (*i), true, error, sizeof(error)-1) ) + status = false; } m_Plugins.clear(); + remqueue.clear(); return status; }