BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/label_sync

This commit is contained in:
Maran 2013-03-10 17:44:35 +01:00
parent 51560b9ecd 4ea03147c3
commit 08cedc452d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/interface.py
View File

@ -470,6 +470,9 @@ class Interface(threading.Thread):
if message not in self.subscriptions[channel]:
self.subscriptions[channel].append(message)
if not self.is_connected:
return
if self.protocol in 'st':
with self.lock:
out = self.send_tcp(messages, channel)
@ -516,14 +519,14 @@ class Interface(threading.Thread):
print "changing server:", server, proxy
self.server = server
self.proxy = proxy
if self.protocol in 'st' and self.s:
if self.is_connected and self.protocol in 'st' and self.s:
self.s.shutdown(socket.SHUT_RDWR)
self.s.close()
self.is_connected = False # this exits the polling loop
self.trigger_callback('disconnecting') # for actively disconnecting
def stop(self):
if self.protocol in 'st' and self.s:
if self.is_connected and self.protocol in 'st' and self.s:
self.s.shutdown(socket.SHUT_RDWR)
self.s.close()