From 1f9f253292bd1af8385e937aaff13a2c6d625bfd Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 4 Jun 2015 11:12:31 +0200
Subject: [PATCH] Added exception handling to listen thread join

---
 plugins/USBPrinting/PrinterConnection.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/USBPrinting/PrinterConnection.py b/plugins/USBPrinting/PrinterConnection.py
index ad231f5207..19c5b5c07a 100644
--- a/plugins/USBPrinting/PrinterConnection.py
+++ b/plugins/USBPrinting/PrinterConnection.py
@@ -244,7 +244,10 @@ class PrinterConnection(SignalEmitter):
             self._connect_thread.join()
         if self._serial is not None:
             self.setIsConnected(False)
-            self._listen_thread.join()
+            try:
+                self._listen_thread.join()
+            except:
+                pass
             self._serial.close()
             
         self._serial = None