From 42c33a2cef3675ee013760f8a757ec6baba046a6 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Tue, 24 Mar 2009 03:00:40 +0100 Subject: [PATCH] Upstream tarball 9536 --- .svn-revision | 2 +- docs/Changelog | 1 + src/UploadQueue.cpp | 7 +++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.svn-revision b/.svn-revision index d54fe857..ceb876c7 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -9535 +9536 diff --git a/docs/Changelog b/docs/Changelog index 585290d6..3b632dc1 100644 --- a/docs/Changelog +++ b/docs/Changelog @@ -124,6 +124,7 @@ Version 2.2.4 - The "don't know yet if there will be another 2.2" version. * Implemented non-interactive mode for amulecmd/amuleweb. * Fixed detection of crypto++ library for versions >= 5.6.0. * Fixed saving wrong window position when exiting while minimized. + * Fixed rare case when we tried to connect to a LowID client. iz0bbz: * Fixed static linking with GeoIP on MinGW/MSYS. diff --git a/src/UploadQueue.cpp b/src/UploadQueue.cpp index 376608d5..acbc0b56 100644 --- a/src/UploadQueue.cpp +++ b/src/UploadQueue.cpp @@ -73,8 +73,8 @@ void CUploadQueue::AddUpNextClient(CUpDownClient* directadd) CClientPtrList::iterator toadd = m_waitinglist.end(); CClientPtrList::iterator toaddlow = m_waitinglist.end(); - sint64 bestscore = -1; - sint64 bestlowscore = -1; + uint32_t bestscore = 0; + uint32_t bestlowscore = 0; CUpDownClient* newclient; // select next client or use given client @@ -109,7 +109,7 @@ void CUploadQueue::AddUpNextClient(CUpDownClient* directadd) } // finished clearing - sint64 cur_score = cur_client->GetScore(true); + uint32_t cur_score = cur_client->GetScore(true); if (cur_score > bestscore) { bestscore = cur_score; toadd = tmp_it; @@ -182,7 +182,6 @@ void CUploadQueue::AddUpNextClient(CUpDownClient* directadd) reqfile->statistic.AddAccepted(); } Notify_UploadCtrlAddClient(newclient); - } void CUploadQueue::Process() -- 2.11.4.GIT