aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Database
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2014-08-02 19:30:55 +0100
committerDDuarte <dnpd.dd@gmail.com>2014-08-02 19:30:55 +0100
commitcb453fa093d205cc0539891670c04b4733d7e735 (patch)
tree412e6ddc5890aaacc95c65bc0e3d463c9db27f61 /src/server/shared/Database
parent56c0581e554e305917099d95a60fcedffeab96d8 (diff)
Core/Shared: Fix world and auth crash on shutdown (PCQ & DbWorker)
Fixes #12704
Diffstat (limited to 'src/server/shared/Database')
-rw-r--r--src/server/shared/Database/DatabaseWorker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Database/DatabaseWorker.cpp b/src/server/shared/Database/DatabaseWorker.cpp
index ca48ebdd811..e130429c8d0 100644
--- a/src/server/shared/Database/DatabaseWorker.cpp
+++ b/src/server/shared/Database/DatabaseWorker.cpp
@@ -50,7 +50,7 @@ void DatabaseWorker::WorkerThread()
_queue->WaitAndPop(operation);
- if (_cancelationToken)
+ if (_cancelationToken || !operation)
return;
operation->SetConnection(_connection);