linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2948
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Sun 2012-06-17 15:28:34 +0200
message:
  Do not automatch queue for bad/removed sources
modified:
  changelog.txt
  dcpp/QueueManager.cpp
  help/get_started.html


--
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-06-16 14:29:41 +0000
+++ changelog.txt	2012-06-17 13:28:34 +0000
@@ -10,6 +10,7 @@
 * [L#957994] Fix glitches with the file list loader (poy)
 * [L#1007103] Correct download logging after an app restart (emtee)
 * [L#1007099] Fix disabled buttons in user matching settings (poy)
+* Do not automatch queue for bad/removed sources (emtee)
 
 -- 0.799 2012-05-05 --
 * Add icons (iceman50)

=== modified file 'dcpp/QueueManager.cpp'
--- dcpp/QueueManager.cpp	2012-06-08 15:27:48 +0000
+++ dcpp/QueueManager.cpp	2012-06-17 13:28:34 +0000
@@ -1533,7 +1533,7 @@
 
 		for(auto qi: matches) {
 			// Size compare to avoid popular spoof
-			if(qi->getSize() == sr->getSize() && !qi->isSource(sr->getUser())) {
+			if(qi->getSize() == sr->getSize() && !qi->isSource(sr->getUser()) && !qi->isBadSource(sr->getUser())) {
 				try {
 					if(!BOOLSETTING(AUTO_SEARCH_AUTO_MATCH))
 						wantConnection = addSource(qi, HintedUser(sr->getUser(), sr->getHubURL()), 0);

=== modified file 'help/get_started.html'
--- help/get_started.html	2011-12-03 20:40:54 +0000
+++ help/get_started.html	2012-06-17 13:28:34 +0000
@@ -87,7 +87,7 @@
 search for files and download from any user. If you don't experience any issues then 
 you can entirely <a href="#morehelp">skip the next section</a>.</p>
 
-<h2>Troubleshooting connectivity problems</h2>
+<h2 id="connection">Troubleshooting connectivity problems</h2>
 
 <p>If you experience any connectivity problems after the required basic setup
 (eg. not able to connect to any hub, no search results, downloads don't start) then you