diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-02 22:53:44 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-02 22:53:44 +0200 |
| commit | 611d51af9837dec14dd320d24ac564991830ba6e (patch) | |
| tree | 1a5f67d61b81c586af8b773c340b28e1dbc9b105 /src/server/game/Server | |
| parent | 97fc632b9d32727480d42e7c056dff72ead8fb4e (diff) | |
| parent | 5e03230f3d665b5ef7fa0804137ac711804b1cb1 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Commands/cs_debug.cpp
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/WorldSocket.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 15cb32113dd..a1e084bc286 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -457,9 +457,15 @@ int WorldSocket::Update (void) if (closing_) return -1; - if (m_OutActive || (m_OutBuffer->length() == 0 && msg_queue()->is_empty())) + if (m_OutActive) return 0; + { + ACE_GUARD_RETURN (LockType, Guard, m_OutBufferLock, 0); + if (m_OutBuffer->length() == 0 && msg_queue()->is_empty()) + return 0; + } + int ret; do ret = handle_output(get_handle()); |