motion is no longer started unless there's at least one camera

configured

diff --git a/motioneye.py b/motioneye.py
index ed6032f99a5a252de634f59894248599d0315890..def4a642b41420c52475cabfb19be79b141f35bf 100755 (executable)
--- a/motioneye.py
+++ b/motioneye.py
@@ -297,8 +297,7 @@ def _start_motion():
 
         ioloop.add_timeout(datetime.timedelta(seconds=settings.MOTION_CHECK_INTERVAL), checker)
     
-    if config.has_enabled_cameras():
-        motionctl.start()
+    motionctl.start()
         
     ioloop.add_timeout(datetime.timedelta(seconds=settings.MOTION_CHECK_INTERVAL), checker)
 

diff --git a/src/handlers.py b/src/handlers.py
index e29c8b627c80fa1008df428699f42f95f48c276a..610403c6ea301947a549f09de1fbf875784e0328 100644 (file)
--- a/src/handlers.py
+++ b/src/handlers.py
@@ -545,8 +545,7 @@ class ConfigHandler(BaseHandler):
         
         if local:
             motionctl.stop()
-            if config.has_enabled_cameras():
-                motionctl.start()
+            motionctl.start()
             
         self.finish_json()
 

diff --git a/src/motionctl.py b/src/motionctl.py
index 176a76ba7927cf74583fce1110ee6b9439e6e6e7..16a3def74d0a8a36dff771965603de5ced9aa3a2 100644 (file)
--- a/src/motionctl.py
+++ b/src/motionctl.py
@@ -54,7 +54,7 @@ def start():
     
     _started = True
     
-    if running():
+    if running() or not config.has_enabled_cameras():
         return
     
     logging.debug('starting motion')