linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2349
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sat 2010-12-18 17:45:06 +0100
message:
  Prevent an endless loop on connection failure
modified:
  changelog.txt
  dcpp/ConnectionManager.cpp
  dcpp/SearchManager.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-12-12 21:16:33 +0000
+++ changelog.txt	2010-12-18 16:45:06 +0000
@@ -57,6 +57,7 @@
 * Select a better default font (poy)
 * [L#681754] Fonts and dialogs respect DPI settings - mark DC++ as DPI aware (poy)
 * Update MiniUPnPc (poy)
+* Prevent an endless loop on connection failure (thanks bigmuscle)
 
 -- 0.770 2010-07-05 --
 * [L#550300] Catch more potential file corruptions (thanks bigmuscle)

=== modified file 'dcpp/ConnectionManager.cpp'
--- dcpp/ConnectionManager.cpp	2010-12-03 17:26:12 +0000
+++ dcpp/ConnectionManager.cpp	2010-12-18 16:45:06 +0000
@@ -261,6 +261,7 @@
 					LogManager::getInstance()->message(_("Connectivity restored"));
 					failed = false;
 				}
+				break;
 			} catch(const SocketException& e) {
 				dcdebug("ConnectionManager::Server::run Stopped listening: %s\n", e.getError().c_str());
 

=== modified file 'dcpp/SearchManager.cpp'
--- dcpp/SearchManager.cpp	2010-08-23 16:04:27 +0000
+++ dcpp/SearchManager.cpp	2010-12-18 16:45:06 +0000
@@ -146,6 +146,7 @@
 					LogManager::getInstance()->message(_("Search enabled again"));
 					failed = false;
 				}
+				break;
 			} catch(const SocketException& e) {
 				dcdebug("SearchManager::run Stopped listening: %s\n", e.getError().c_str());