Merge pull request #7 from CDRV/dev

Main merge for 1.0.5 release
CDRV · May 4, 2023 · ac1c1f7 · ac1c1f7
2 parents e1c3d81 + a9dbf7a
commit ac1c1f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Globals.py b/Globals.py
@@ -8,4 +8,4 @@
 
 config_man = ConfigManager()
 
-version_string = '1.0.4'
+version_string = '1.0.5'
diff --git a/libs/servers/WatchServer.py b/libs/servers/WatchServer.py
@@ -231,7 +231,7 @@ def do_POST(self):
             return
 
         # Stop timer to send data, since we received new data
-        if self.base_server.file_syncher_timer.is_alive():
+        if self.base_server.file_syncher_timer and self.base_server.file_syncher_timer.is_alive():
             self.base_server.file_syncher_timer.cancel()
             self.base_server.file_syncher_timer = None
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@

		config_man = ConfigManager()

		version_string = '1.0.4'
		version_string = '1.0.5'