X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Ffnet-dc.c;h=54daeb7aeb2a9ace9ae7cd892f67ec2b4eed4fd5;hb=734dc54e7df608612f5743b210280ac1629107a7;hp=a20aa0567b0e3ef1ce9733d2dd70604332345745;hpb=1d85f24bb4bdc0f15f9560bc867befeff8eabc36;p=doldaconnect.git diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c index a20aa05..54daeb7 100644 --- a/daemon/fnet-dc.c +++ b/daemon/fnet-dc.c @@ -590,6 +590,7 @@ static char *getadcid(struct dcpeer *peer) char *ret; int isfilelist; + isfilelist = 0; if(!wcscmp(peer->transfer->path, L"files.xml") || !wcscmp(peer->transfer->path, L"files.xml.bz2") || !wcscmp(peer->transfer->path, L"MyList.DcLst")) isfilelist = 1; if(!isfilelist && (peer->transfer->hash != NULL) && isdchash(peer->transfer->hash) && supports(peer, "tthf")) @@ -3073,13 +3074,10 @@ static void hubdestroy(struct fnetnode *fn) struct qcommand *qcmd; hub = (struct dchub *)fn->data; - if(fn->sk != NULL) + if((fn->sk != NULL) && (fn->sk->data == fn)) { - if(fn->sk->data == fn) - { - fn->sk->data = NULL; - putfnetnode(fn); - } + fn->sk->data = NULL; + putfnetnode(fn); } if(hub == NULL) return;