From d1e44539d5a3d292a0c5574fa24f74332c36c128 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Tue, 23 Nov 2021 12:40:05 +0100
Subject: [PATCH] end whats going on if hour changed

---
 camera.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/camera.py b/camera.py
index d14b350..2a7ffad 100644
--- a/camera.py
+++ b/camera.py
@@ -168,17 +168,18 @@ class Camera:
             time.sleep(1)
         print('presets loaded')
 
+    def hour_changed(self):
+        return self.hour is not None and time.gmtime().tm_hour != self.hour:
+
     def sleep(self, seconds):
         n = float(seconds)
-        if self.abort:
+        if self.abort or self.hour_changed():
             return
         while n > 0:
             step = min(n, 0.5)
             time.sleep(step)
             n -= step
-            if self.abort:
-                return
-            if self.hour is not None and time.gmtime().tm_hour != self.hour:
+            if self.abort or self.hour_changed():
                 return
 
     def sequence(self, steps=[], speed=12, goto_first=True, loop=False, hour_loop=False):
@@ -249,7 +250,7 @@ class Camera:
                 last = self.status()
 
     def goto_preset(self, id, pan, tilt, zoom=1, zoom_last=False):
-        if self.abort:
+        if self.abort or self.hour_changed():
             return
         presets = self.get_presets(True)
         if isinstance(id, str):
@@ -367,7 +368,7 @@ class Camera:
                 self.continuous(move)
             if sum(map(abs, move.values())) and not self.abort:
                 time.sleep(0.1)
-            if self.abort:
+            if self.abort or self.hour_changed():
                 self.continuous(self.STOP)
                 return
         self.continuous(self.STOP)