summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-05-15 17:51:36 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-05-15 17:51:36 -0700
commit3f44f25774a84cd95ed47c249a8f5aeee3ea8676 (patch)
tree96c931ca2024f54aa7173677c09d855c182fde26 /src/common
parent642ece5724d07898b572da8a1923d0ba5073bcc4 (diff)
parentb6672372e213cda5971f5934686aa8539a06d0dd (diff)
downloadtmwa-3f44f25774a84cd95ed47c249a8f5aeee3ea8676.tar.gz
tmwa-3f44f25774a84cd95ed47c249a8f5aeee3ea8676.tar.bz2
tmwa-3f44f25774a84cd95ed47c249a8f5aeee3ea8676.tar.xz
tmwa-3f44f25774a84cd95ed47c249a8f5aeee3ea8676.zip
Merge remote-tracking branch 'origin/master' into test
Diffstat (limited to 'src/common')
-rw-r--r--src/common/socket.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index ae89757..2acbeb8 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -92,7 +92,7 @@ void send_from_fifo(int fd)
if (len > 0)
{
session[fd]->wdata_size -= len;
- if (len < (ssize_t)session[fd]->wdata_size)
+ if (session[fd]->wdata_size)
{
memmove(session[fd]->wdata, session[fd]->wdata + len,
session[fd]->wdata_size);