← Back to team overview

linuxdcpp-team team mailing list archive

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2177: Prevent hub-provided cmds from "open own list" from going to the wrong hub

 

------------------------------------------------------------
revno: 2177
committer: poy <poy@xxxxxxxxxx>
branch nick: repo
timestamp: Tue 2010-07-06 17:07:11 +0200
message:
  Prevent hub-provided cmds from "open own list" from going to the wrong hub
modified:
  changelog.txt
  dcpp/ClientManager.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	2010-07-05 21:26:03 +0000
+++ changelog.txt	2010-07-06 15:07:11 +0000
@@ -1,3 +1,5 @@
+* Prevent hub-provided cmds from "open own list" from going to the wrong hub
+
 -- 0.770 2010-07-05 --
 * [L#550300] Catch more potential file corruptions (thanks bigmuscle)
 * Fix socket resolve in *nix systems (thanks razzloss)

=== modified file 'dcpp/ClientManager.cpp'
--- dcpp/ClientManager.cpp	2010-06-30 14:40:00 +0000
+++ dcpp/ClientManager.cpp	2010-07-06 15:07:11 +0000
@@ -387,7 +387,7 @@
 	 * SearchManager::onRES(const AdcCommand& cmd, ...). when that is done, and SearchResults are
 	 * switched to storing only reliable HintedUsers (found with the token of the ADC command),
 	 * change this call to findOnlineUser_hint. */
-	OnlineUser* ou = findOnlineUser(user.user->getCID(), user.hint, false);
+	OnlineUser* ou = findOnlineUser(user.user->getCID(), user.hint.empty() ? uc.getHub() : user.hint, false);
 	if(!ou)
 		return;