Fix compilation of SQL modules, use GlobalCulls to clean up deleted modules

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11780 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 4 insertions, 5 deletions

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 023ead94b..a0ac9ffac 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -671,9 +671,9 @@ class ModuleSQL;
 class DispatcherThread : public SocketThread
 {
  private:
-	ModuleSQL* Parent;
+	ModuleSQL* const Parent;
  public:
-	DispatcherThread(ModuleSQL* CreatorModule) : SocketThread(Instance), Parent(CreatorModule),{ }
+	DispatcherThread(ModuleSQL* CreatorModule) : Parent(CreatorModule) { }
 	~DispatcherThread() { }
 	virtual void Run();
 	virtual void OnNotify();
@@ -684,7 +684,6 @@ ModuleSQL::ModuleSQL() : rehashing(false)
 	ServerInstance->Modules->UseInterface("SQLutils");
 
 	Conf = new ConfigReader;
-	PublicServerInstance = ServerInstance;
 	currid = 0;
 
 	Dispatcher = new DispatcherThread(this);
@@ -769,7 +768,7 @@ Version ModuleSQL::GetVersion()
 
 void DispatcherThread::Run()
 {
-	LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent);
+	LoadDatabases(Parent->Conf, Parent);
 
 	SQLConnection* conn = NULL;
 
@@ -779,7 +778,7 @@ void DispatcherThread::Run()
 		if (Parent->rehashing)
 		{
 			Parent->rehashing = false;
-			LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent);
+			LoadDatabases(Parent->Conf, Parent);
 		}
 
 		conn = NULL;