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

2026-01-23 18:36:31 +01:00 · 2014-10-02 22:36:58 +02:00
parent 3545d60b7d d828d16e9e
commit caeb933d9e
4 changed files with 28 additions and 3 deletions
--- a/src/server/shared/Threading/ProducerConsumerQueue.h
+++ b/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();
    }