From 7d1e7c60c81bcf12e30f05de1d5701818e81780c Mon Sep 17 00:00:00 2001 From: elechapt Date: Mon, 26 Jun 2023 11:45:17 +0200 Subject: [PATCH 1/2] Fixing bug #180 --- picoscope/picobase.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/picoscope/picobase.py b/picoscope/picobase.py index bb4f667..bdcf674 100644 --- a/picoscope/picobase.py +++ b/picoscope/picobase.py @@ -881,9 +881,16 @@ def close(self): might take some time. """ - if self.handle is not None: - self._lowLevelCloseUnit() - self.handle = None + try: + if self.handle is not None: + self._lowLevelCloseUnit() + self.handle = None + except AttributeError: + # _lowLevelCloseUnit raise: libps5000a.so not found if not connected + pass + except OSError: + # self.handle doesn't exist when not connected + pass def stop(self): """Stop scope acquisition.""" From 82a4a5fd357543603a71668551872ca25e72f3e3 Mon Sep 17 00:00:00 2001 From: elechapt Date: Mon, 26 Jun 2023 14:22:32 +0200 Subject: [PATCH 2/2] Switch comments --- picoscope/picobase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/picoscope/picobase.py b/picoscope/picobase.py index bdcf674..0e612c8 100644 --- a/picoscope/picobase.py +++ b/picoscope/picobase.py @@ -886,10 +886,10 @@ def close(self): self._lowLevelCloseUnit() self.handle = None except AttributeError: - # _lowLevelCloseUnit raise: libps5000a.so not found if not connected + # self.handle doesn't exist when not connected pass except OSError: - # self.handle doesn't exist when not connected + # _lowLevelCloseUnit raise: libps5000a.so not found if not connected pass def stop(self):