From 8bb4f338523810035a3e1031bb2d0e0a4c488254 Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Wed, 10 Sep 2014 19:57:02 +0200
Subject: Core/DB: Fix crash on shutdown

Fix race condition crash on shutdown, closing MySQL connections with queries still being executed
---
 src/server/shared/Database/MySQLConnection.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/server/shared/Database/MySQLConnection.cpp')

diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index 4e46ff0e3a1..abdf2a2cc3c 100644
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -57,14 +57,14 @@ m_connectionFlags(CONNECTION_ASYNC)
 
 MySQLConnection::~MySQLConnection()
 {
+    if (m_worker)
+        delete m_worker;
+
     for (size_t i = 0; i < m_stmts.size(); ++i)
         delete m_stmts[i];
 
     if (m_Mysql)
         mysql_close(m_Mysql);
-
-    if (m_worker)
-        delete m_worker;
 }
 
 void MySQLConnection::Close()
-- 
cgit v1.2.3