From: Fredrik Tolf Date: Fri, 31 Aug 2007 20:44:06 +0000 (+0200) Subject: Fixed transfer stall detecion in dsh. X-Git-Tag: 1.0~38^2 X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=05ac1f105db40c360508f324dd1af7f828024e94;p=doldaconnect.git Fixed transfer stall detecion in dsh. --- diff --git a/clients/gui-shell/dsh.c b/clients/gui-shell/dsh.c index 332e0df..652e45e 100644 --- a/clients/gui-shell/dsh.c +++ b/clients/gui-shell/dsh.c @@ -48,6 +48,7 @@ struct trinfo { int ostate; int opos, spos, speed; time_t lastprog; + int warned; double sprog; }; @@ -287,11 +288,14 @@ void updatetrinfo(void) if(tri->opos != tr->curpos) { tri->opos = tr->curpos; tri->lastprog = now; + tri->warned = 0; } -#ifdef NOTIFY - if((tr->state = DC_TRNS_MAIN) && (now - tri->lastprog > 600)) { - if(dcpid == 0) +#ifdef HAVE_NOTIFY + if((tr->state = DC_TRNS_MAIN) && (now - tri->lastprog > 600) && !tri->warned) { + if(dcpid == 0) { notify(&trnote, "transfer.error", _("Transfer stalled"), _("The transfer of %ls from %ls has not made progress for 10 minutes"), getfilename(tr->path), tr->peernick); + tri->warned = 1; + } } #endif if((tr->state == DC_TRNS_MAIN) && (dnow - tri->sprog > 10)) {