Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-06-14 09:50:07 +02:00
commit 52f852bc6d
3 files changed
+17 -9

No files matched your search

+2
View File
@@ -550,6 +550,8 @@ def send_recv_loop(epoll, console, router, esc_char, stop_event):
esc_state = True
else:
router.write(buf)
except ConnectionError as e:
pass
finally:
router.unregister(epoll)
console.unregister(epoll)