sourcemm/CPlugin.cpp
changeset 82 81b14823a2c3
parent 76 39266faeec97
child 97 7d3a2a8d5bf5
     1.1 --- a/sourcemm/CPlugin.cpp	Sat Jun 25 12:55:26 2005 +0000
     1.2 +++ b/sourcemm/CPlugin.cpp	Sun Jun 26 19:15:24 2005 +0000
     1.3 @@ -30,11 +30,11 @@
     1.4  
     1.5  CPluginManager::~CPluginManager()
     1.6  {
     1.7 -	if (m_Plugins.size())
     1.8 +	/*if (m_Plugins.size())
     1.9  	{
    1.10  		UnloadAll();
    1.11  		m_Plugins.clear();
    1.12 -	}
    1.13 +	}*/
    1.14  }
    1.15  
    1.16  CPluginManager::CPlugin::CPlugin() : m_Lib(NULL), m_API(NULL), m_Id(0), m_Source(0)
    1.17 @@ -388,30 +388,23 @@
    1.18  bool CPluginManager::UnloadAll()
    1.19  {
    1.20  	PluginIter i;
    1.21 -	bool status = true;
    1.22 +
    1.23 +	std::list<SourceMM::CPluginManager::CPlugin *> remqueue;
    1.24  
    1.25  	for (i=m_Plugins.begin(); i!=m_Plugins.end(); i++)
    1.26 -	{
    1.27 -		if ( (*i) )
    1.28 -		{
    1.29 -			if ( (*i)->m_API )
    1.30 -			{
    1.31 -				if ( !(*i)->m_API->Unload(NULL, 0) )
    1.32 -					status = false;
    1.33 +		remqueue.push_back( (*i) );
    1.34 +
    1.35 +	char error[128];
    1.36 +	bool status = true;
    1.37  
    1.38 -				UnregAllConCmds( (*i) );
    1.39 -
    1.40 -				//Unlink from SourceHook
    1.41 -				g_SourceHook.UnloadPlugin( (*i)->m_Id );
    1.42 -
    1.43 -				//Free the DLL
    1.44 -				dlclose( (*i)->m_Lib );
    1.45 -			}
    1.46 -			delete (*i);
    1.47 -		}
    1.48 +	for (i=remqueue.begin(); i!=remqueue.end(); i++)
    1.49 +	{
    1.50 +		if ( !_Unload( (*i), true, error, sizeof(error)-1) )
    1.51 +			status = false;
    1.52  	}
    1.53  
    1.54  	m_Plugins.clear();
    1.55 +	remqueue.clear();
    1.56  
    1.57  	return status;
    1.58  }