Fix thread join not working for subclasses of Thread because of C++ destructor ordering

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

2 files changed, 2 insertions, 2 deletions

diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp
index 5fd62f55e..9cc7a567c 100644
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -668,6 +668,7 @@ class ModuleMsSQL : public Module
 
 	virtual ~ModuleMsSQL()
 	{
+		queryDispatcher->join();
 		delete queryDispatcher;
 		ClearQueue();
 		ClearAllConnections();
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 465992d30..224bf0f56 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -682,8 +682,7 @@ ModuleSQL::ModuleSQL(InspIRCd* Me) : Module(Me), rehashing(false)
 
 	if (!ServerInstance->Modules->PublishFeature("SQL", this))
 	{
-		/* Tell worker thread to exit NOW,
-		 * Automatically joins */
+		Dispatcher->join();
 		delete Dispatcher;
 		ServerInstance->Modules->DoneWithInterface("SQLutils");
 		throw ModuleException("m_mysql: Unable to publish feature 'SQL'");