Merge remote-tracking branch 'upstream/master' into y_wrapperbug

2015-01-27 13:25:24 -05:00 · 2015-01-27 13:25:24 -05:00 · 44cd722412
parent 1787a53e1c e56ec60091
commit 44cd722412
1 changed files with 1 additions and 1 deletions
--- a/src/Peer/Peer.py
+++ b/src/Peer/Peer.py
@ -124,7 +124,7 @@ class Peer:
 	# Stop and remove from site
 	def remove(self):
 		self.log.debug("Removing peer...Connection error: %s, Hash failed: %s" % (self.connection_error, self.hash_failed))
-		del(self.site.peers[self.key])
+		if self.key in self.site.peers: del(self.site.peers[self.key])
 		self.socket.close()