diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-08-10 19:55:07 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-08-10 19:55:07 +0000 |
| commit | 8235290c734c17f5b52533876136e9a61d231c9d (patch) | |
| tree | 82acae114b8e64b7b53b17b257f292f8e6b0686d /src/modules | |
| parent | 5c4212ee9be88b05f39fc5a0fb0a8fa6366e048b (diff) | |
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
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/extra/m_mssql.cpp | 1 | ||||
| -rw-r--r-- | src/modules/extra/m_mysql.cpp | 3 |
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'"); |