From 829eab570a996bd8160527b25edc64a827cebff1 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Thu, 23 Jul 2020 12:38:22 +0100
Subject: [PATCH] Small change to closing of scope

---
 scope.py | 6 +++---
 vm.py    | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scope.py b/scope.py
index a5ba945..e6848bf 100755
--- a/scope.py
+++ b/scope.py
@@ -43,8 +43,8 @@ class Scope(vm.VirtualMachine):
                 break
             else:
                 raise RuntimeError("No matching serial device found")
-        Log.info(f"Connecting to scope at {url}")
         self.close()
+        Log.info(f"Connecting to scope at {url}")
         parts = urlparse(url, scheme='file')
         if parts.scheme == 'file':
             self._reader = self._writer = streams.SerialStream(device=parts.path)
@@ -115,8 +115,8 @@ class Scope(vm.VirtualMachine):
         self.close()
 
     def close(self):
-        super().close()
-        Log.info("Closed scope")
+        if super().close():
+            Log.info("Closed scope")
 
     def calculate_lo_hi(self, low, high, params):
         if not isinstance(params, self.AnalogParams):
diff --git a/vm.py b/vm.py
index ca734ed..d716a72 100644
--- a/vm.py
+++ b/vm.py
@@ -281,6 +281,8 @@ class VirtualMachine:
             self._writer.close()
             self._writer = None
             self._reader = None
+            return True
+        return False
 
     __del__ = close