merged fixes from RC_0_16

2012-10-21 20:24:14 +00:00
parent f61b95f782
commit 16630f94d1
5 changed files with 22 additions and 4 deletions
--- a/src/connection_queue.cpp
+++ b/src/connection_queue.cpp
@@ -156,7 +156,8 @@ namespace libtorrent
 				continue;
 			}
 			TORRENT_TRY {
-				e.on_connect(-1);
+				if (e.connecting) e.on_timeout();
+				else e.on_connect(-1);
 			} TORRENT_CATCH(std::exception&) {}
 			tmp.pop_front();
 		}