From 4c02114b750cab795ef4bfbab55cc22b4cbbddaa Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Sat, 6 Jul 2024 13:43:19 -0700 Subject: [PATCH] fix null pointer if closing an interface which was already shutting down --- meshtastic/serial_interface.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meshtastic/serial_interface.py b/meshtastic/serial_interface.py index 9a8307d..13b1f6e 100644 --- a/meshtastic/serial_interface.py +++ b/meshtastic/serial_interface.py @@ -67,9 +67,10 @@ class SerialInterface(StreamInterface): def close(self): """Close a connection to the device""" - self.stream.flush() - time.sleep(0.1) - self.stream.flush() - time.sleep(0.1) + if self.stream: # Stream can be null if we were already closed + self.stream.flush() # FIXME: why are there these two flushes with 100ms sleeps? This shouldn't be necessary + time.sleep(0.1) + self.stream.flush() + time.sleep(0.1) logging.debug("Closing Serial stream") StreamInterface.close(self)