From 7c84349990f21f783f4b24c113fb372a3c00164b Mon Sep 17 00:00:00 2001 From: faketruth Date: Wed, 22 Aug 2012 14:22:21 +0000 Subject: WebAdmin should not cause crashes anymore Got rid of cWebPlugin_Lua cPlugin_Lua is also a cWebPlugin now, so plugins don't need a separate cWebPlugin object Changed some stuff to use AString instead of char* git-svn-id: http://mc-server.googlecode.com/svn/trunk@777 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cPluginManager.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source/cPluginManager.cpp') diff --git a/source/cPluginManager.cpp b/source/cPluginManager.cpp index ec75a2e11..041180818 100644 --- a/source/cPluginManager.cpp +++ b/source/cPluginManager.cpp @@ -623,11 +623,11 @@ bool cPluginManager::CallHookUpdatedSign(cWorld * a_World, int a_BlockX, int a_B -cPlugin* cPluginManager::GetPlugin( const char* a_Plugin ) const +cPlugin* cPluginManager::GetPlugin( const AString & a_Plugin ) const { for( PluginList::const_iterator itr = m_Plugins.begin(); itr != m_Plugins.end(); ++itr ) { - if (strcmp((*itr)->GetName(), a_Plugin) == 0 ) + if ((*itr)->GetName().compare(a_Plugin) == 0) { return *itr; } @@ -657,8 +657,6 @@ void cPluginManager::UnloadPluginsNow() cPlugin_Lua* LuaPlugin = *m_LuaPlugins.begin(); if( LuaPlugin ) { - cWebAdmin* WebAdmin = cRoot::Get()->GetWebAdmin(); - if( WebAdmin ) WebAdmin->RemovePlugin( LuaPlugin->GetLuaState() ); delete LuaPlugin; } m_LuaPlugins.remove( LuaPlugin ); -- cgit v1.2.3