linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3113
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2012-11-06 19:52:30 +0100
message:
  redo rev 3110
modified:
  changelog.txt
  dcpp/QueueManager.cpp
  win32/AboutDlg.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'changelog.txt'
--- changelog.txt	2012-11-06 18:49:00 +0000
+++ changelog.txt	2012-11-06 18:52:30 +0000
@@ -5,7 +5,7 @@
 * Remove the "Windows UPnP" port mapper in favor of MiniUPnP (poy)
 * Add a UI interface to the plugin API (poy)
 * Delete "View as text" files only when their window is closed (poy)
-* Fix queue matching when files have the same TTH but a different size (thanks bigmuscle)
+* Fix queue matching when files have the same TTH but a different size (thanks irainman)
 * Update Boost to version 1.52
 
 -- 0.802 2012-10-20 --

=== modified file 'dcpp/QueueManager.cpp'
--- dcpp/QueueManager.cpp	2012-11-06 18:32:58 +0000
+++ dcpp/QueueManager.cpp	2012-11-06 18:52:30 +0000
@@ -764,7 +764,7 @@
 			if(qi->isSet(QueueItem::FLAG_USER_LIST))
 				continue;
 			auto j = tthMap.find(qi->getTTH());
-			if(j != tthMap.end() && i.second->getSize() == j->second->getSize()) {
+			if(j != tthMap.end() && j->second->getSize() == qi->getSize()) {
 				try {
 					addSource(qi, dl.getUser(), QueueItem::Source::FLAG_FILE_NOT_AVAILABLE);
 				} catch(...) {

=== modified file 'win32/AboutDlg.cpp'
--- win32/AboutDlg.cpp	2012-10-20 16:10:39 +0000
+++ win32/AboutDlg.cpp	2012-11-06 18:52:30 +0000
@@ -59,7 +59,7 @@
 "steven sheehy, tobias nygren, poy, dorian, stephan hohe, mafa_45, mikael eman, james ross, "
 "stanislav maslovski, david grundberg, pavel andreev, yakov suraev, kulmegil, smir, emtee, individ, "
 "pseudonym, crise, ben, ximin luo, radox, razzloss, andrew browne, darkklor, vasily.n, netcelli, "
-"gennady proskurin, iceman50, flow84, alexander sashnov, yorhel. Keep it coming!";
+"gennady proskurin, iceman50, flow84, alexander sashnov, yorhel, irainman. Keep it coming!";
 
 AboutDlg::AboutDlg(dwt::Widget* parent) :
 dwt::ModalDialog(parent),