Merge pull request #373 from okahilak/fix-stop-navigation-when-serial-port-connection-is-none

FIX: StopNavigation function when serial port connection has not been formed

Merge pull request #373 from okahilak/fix-stop-navigation-when-serial-port-connection-is-none
FIX: StopNavigation function when serial port connection has not been formed
Victor Hugo Souza · GitHub
2 parents 4f539b46 aa4f4cad
Showing 1 changed file with 2 additions and 1 deletions Show diff stats
invesalius/navigation/navigation.py
@@ -324,9 +324,10 @@ class Navigation():
         self.coord_queue.clear()
         self.coord_queue.join()
  
-        if self.SerialPortEnabled():
+        if self.serial_port_connection is not None:
             self.serial_port_connection.join()
  
+        if self.SerialPortEnabled():
             self.serial_port_queue.clear()
             self.serial_port_queue.join()
...	...	@@ -324,9 +324,10 @@ class Navigation():
324	324	self.coord_queue.clear()
325	325	self.coord_queue.join()
326	326
327		- if self.SerialPortEnabled():
	327	+ if self.serial_port_connection is not None:
328	328	self.serial_port_connection.join()
329	329
	330	+ if self.SerialPortEnabled():
330	331	self.serial_port_queue.clear()
331	332	self.serial_port_queue.join()
332	333
...	...