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

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp

1 files changed, 3 insertions, 8 deletions

diff --git a/src/server/shared/Threading/ProducerConsumerQueue.h b/src/server/shared/Threading/ProducerConsumerQueue.h
index accb0aebb11..a76b8b0b5c0 100644
--- a/src/server/shared/Threading/ProducerConsumerQueue.h
+++ b/src/server/shared/Threading/ProducerConsumerQueue.h
@@ -39,10 +39,8 @@ public:
 
     void Push(const T& value)
     {
-        {
-            std::lock_guard<std::mutex> lock(_queueLock);
-            _queue.push(std::move(value));
-        }
+        std::lock_guard<std::mutex> lock(_queueLock);
+        _queue.push(std::move(value));
 
         _condition.notify_one();
     }
@@ -72,10 +70,7 @@ public:
     {
         std::unique_lock<std::mutex> lock(_queueLock);
 
-        while (_queue.empty() && !_shutdown)
-        {
-            _condition.wait(lock);
-        }
+        _condition.wait(lock, [this]() { return !_queue.empty() || _shutdown; });
 
         if (_queue.empty() || _shutdown)
             return;