set default event gap to 10

diff --git a/src/config.py b/src/config.py
index 49659e2a5ac33edd4d79ef93bef5eedbdccfbbe9..aaa1554668b5c55d13d0103029b7e2033b040383 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -1328,13 +1328,13 @@ def _set_default_motion_camera(camera_id, data, old_motion=False):
         data.setdefault('output_normal', False)
         data.setdefault('jpeg_filename', '')
         data.setdefault('output_all', False)
-        data.setdefault('gap', 30)
+        data.setdefault('gap', 10)
 
     else:
         data.setdefault('output_pictures', False)
         data.setdefault('picture_filename', '')
         data.setdefault('emulate_motion', False)
-        data.setdefault('event_gap', 30)
+        data.setdefault('event_gap', 10)
     
     data.setdefault('snapshot_interval', 0)
     data.setdefault('snapshot_filename', '')

diff --git a/src/remote.py b/src/remote.py
index 45f51670bb78638ea63d36e288a97820119aedf3..92d5b319e2d1688dbe72b4948d3b59800440aa12 100644 (file)
--- a/src/remote.py
+++ b/src/remote.py
@@ -244,7 +244,7 @@ def get_current_picture(local_config, callback, width, height):
             cookies = cookies.split(';')
             cookies = [[i.strip() for i in c.split('=')] for c in cookies]
             cookies = dict([c for c in cookies if len(c) == 2])
-            motion_detected = cookies.get('motion_detected_' + camera_id) == 'true'
+            motion_detected = cookies.get('motion_detected_' + str(camera_id)) == 'true'
         
         if response.error:
             logging.error('failed to get current picture for remote camera %(id)s on %(url)s: %(msg)s' % {