Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

src/server/shared/Threading/ProducerConsumerQueue.h

@@ -82,7 +82,7 @@ public:
 
     void Cancel()
     {
-        _queueLock.lock();
+        std::unique_lock<std::mutex> lock(_queueLock);
 
         while (!_queue.empty())
         {
@@ -95,8 +95,6 @@ public:
 
         _shutdown = true;
 
-        _queueLock.unlock();
-
         _condition.notify_all();
     }