From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 5 Nov 2009 16:03:17 +0000 (+0100)
Subject: Merge branch 'master' of nerv:/usr/local/src/doldaconnect
X-Git-Url: http://git.dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=1d180b41e29d53de0d76e7638962afe3f9375249;hp=37a87e6b96c114f1ca531d7a449183d5f5827218

Merge branch 'master' of nerv:/usr/local/src/doldaconnect
---

diff --git a/daemon/transfer.c b/daemon/transfer.c
index 62e81d6..1863e74 100644
--- a/daemon/transfer.c
+++ b/daemon/transfer.c
@@ -142,7 +142,8 @@ static void localread(struct socket *sk, struct transfer *transfer)
 	transfer->localpos += blen;
 	bytesupload += blen;
     }
-    curpos = transfer->localpos - socktqueuesize(transfer->datapipe);
+    if((curpos = transfer->localpos - socktqueuesize(transfer->datapipe)) < 0)
+	curpos = 0;
     if(curpos != transfer->curpos) {
 	transfer->curpos = curpos;
 	CBCHAINDOCB(transfer, trans_p, transfer);