diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-10-02 22:36:58 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-10-02 22:36:58 +0200 |
| commit | caeb933d9e21efb80b36e4b2cc805a2ec02db237 (patch) | |
| tree | a424f6f23ffa091594a4e6c4967c7858a9931d0c /src/server/shared | |
| parent | 3545d60b7d70e7097e1aeda8b7dd6af19a6c0ab8 (diff) | |
| parent | d828d16e9e0a7416823c07d27a19f4362c3f0826 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/Threading/ProducerConsumerQueue.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/server/shared/Threading/ProducerConsumerQueue.h b/src/server/shared/Threading/ProducerConsumerQueue.h index a76b8b0b5c0..d0b3631a9dd 100644 --- 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(); } |