add/remove cameras properly resets the refresh lock

diff --git a/doc/todo.txt b/doc/todo.txt
index 73448ee1375780a7584c3925f1900d63db045e26..fc9ed4287032500a725d9f41e26041f2e078da9a 100644 (file)
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -1,3 +1,7 @@
+-> picam2 : nu avem hue si da eroare
+-> picam2: zeroconf refreshEnabled == 1
+-> change password: refresh asks for auth 
+
 -> style scroll bars
 -> hint text next to section titles
 -> clickable hints

diff --git a/src/config.py b/src/config.py
index e5586309288b53495fa2d33d613e12c860050936..e3b0f980c64f3704f0e0af0f463c96b7bef5f8ab 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -137,7 +137,7 @@ def get_camera_ids():
     
     camera_ids = []
     
-    pattern = _CAMERA_CONFIG_FILE_NAME.replace('%(id)s', '(\d+)')
+    pattern = '^' + _CAMERA_CONFIG_FILE_NAME.replace('%(id)s', '(\d+)') + '$'
     for name in ls:
         match = re.match(pattern, name)
         if match:

diff --git a/static/js/main.js b/static/js/main.js
index 5c052313ff85bb1eb901e5743cfbd32fa0cc33af..b14f3dc409917aeb083d39eb8fa5eed188f8d3e0 100644 (file)
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -753,7 +753,7 @@ function doRemCamera() {
                 return;
             }
             
-            hideApply();
+            endProgress();
             fetchCurrentConfig();
         });
     });
@@ -1078,7 +1078,7 @@ function runAddCameraDialog() {
                         return;
                     }
                     
-                    hideApply();
+                    endProgress();
                     var addCameraOption = $('#videoDeviceSelect').find('option[value=add]');
                     addCameraOption.before('<option value="' + data.id + '">' + data.name + '</option>');
                     $('#videoDeviceSelect').val(data.id).change();