diff options
author | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
---|---|---|
committer | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
commit | 42d1562183dd0598de155e30264393edc6925a21 (patch) | |
tree | 73263639af50fcf177ff9bdf3791d8fc5afce454 /src/server/shared/Threading/LockedQueue.h | |
parent | 7f4be7e93a03c2f4c964590efb166c7dadcb6837 (diff) | |
parent | 7f89678bcda1b58ff0701c0915074e81a9caf720 (diff) |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore.git
Conflicts:
src/server/game/Entities/Player/Player.cpp
Diffstat (limited to 'src/server/shared/Threading/LockedQueue.h')
-rwxr-xr-x | src/server/shared/Threading/LockedQueue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Threading/LockedQueue.h b/src/server/shared/Threading/LockedQueue.h index 72a916eb295..92eab440684 100755 --- a/src/server/shared/Threading/LockedQueue.h +++ b/src/server/shared/Threading/LockedQueue.h @@ -91,7 +91,7 @@ namespace ACE_Based return false; result = _queue.front(); - if(!check.Process(result)) + if (!check.Process(result)) return false; _queue.pop_front(); |