This commit is contained in:
parent
83e925c0cd
commit
1e25af7f0d
|
@ -432,6 +432,8 @@ class Network(util.DaemonThread):
|
||||||
self.print_error("stopping network")
|
self.print_error("stopping network")
|
||||||
for interface in self.interfaces.values():
|
for interface in self.interfaces.values():
|
||||||
self.close_interface(interface)
|
self.close_interface(interface)
|
||||||
|
if self.interface:
|
||||||
|
self.close_interface(self.interface)
|
||||||
assert self.interface is None
|
assert self.interface is None
|
||||||
assert not self.interfaces
|
assert not self.interfaces
|
||||||
self.connecting = set()
|
self.connecting = set()
|
||||||
|
@ -669,7 +671,8 @@ class Network(util.DaemonThread):
|
||||||
# Responses to connection attempts?
|
# Responses to connection attempts?
|
||||||
while not self.socket_queue.empty():
|
while not self.socket_queue.empty():
|
||||||
server, socket = self.socket_queue.get()
|
server, socket = self.socket_queue.get()
|
||||||
self.connecting.remove(server)
|
if server in self.connecting:
|
||||||
|
self.connecting.remove(server)
|
||||||
if socket:
|
if socket:
|
||||||
self.new_interface(server, socket)
|
self.new_interface(server, socket)
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue