From cb453fa093d205cc0539891670c04b4733d7e735 Mon Sep 17 00:00:00 2001
From: DDuarte <dnpd.dd@gmail.com>
Date: Sat, 2 Aug 2014 19:30:55 +0100
Subject: Core/Shared: Fix world and auth crash on shutdown (PCQ & DbWorker)

Fixes #12704
---
 src/server/shared/Database/DatabaseWorker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server/shared/Database')

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);
-- 
cgit v1.2.3