fixed motion running setup mode

diff --git a/motioneye/config.py b/motioneye/config.py
index e8c069002ccf4c0fabe61346c1db97dae89aeed9..a050da26ddfd13e62169a616a986382eada056b6 100644 (file)
--- a/motioneye/config.py
+++ b/motioneye/config.py
@@ -817,7 +817,7 @@ def motion_camera_ui_to_dict(ui, old_config=None):
         data['ffmpeg_output_movies'] = True
         recording_mode = ui['recording_mode']
         if recording_mode == 'motion-triggered':
-            data['emulate_motion'] = False  
+            data['emulate_motion'] = False
 
         elif recording_mode == 'continuous':
             data['emulate_motion'] = True

diff --git a/motioneye/motionctl.py b/motioneye/motionctl.py
index 7cdffe1abcf6cb8550163693631cadbb63902218..bd79cbc9d867c3dc3be2429e5ddb2424ba4ca4aa 100644 (file)
--- a/motioneye/motionctl.py
+++ b/motioneye/motionctl.py
@@ -109,9 +109,9 @@ def start(deferred=False):
     motion_pid_path = os.path.join(settings.RUN_PATH, 'motion.pid')
     
     args = [program,
-            '-c', motion_config_path,
             '-n',
-            '-d']
+            '-d',
+            '-c', motion_config_path]
     
     if settings.LOG_LEVEL == logging.DEBUG:
         args.append('9')

diff --git a/motioneye/static/js/main.js b/motioneye/static/js/main.js
index 540f25b48b6e941e849e5309219ec958bf3f444e..532787d27830be45c60e2f2a400d543886b44e75 100644 (file)
--- a/motioneye/static/js/main.js
+++ b/motioneye/static/js/main.js
@@ -635,6 +635,8 @@ function initUI() {
         });
     });
     
+    /* various change handlers */
+    
     $('#storageDeviceSelect').change(function () {
         $('#rootDirectoryEntry').val('/');
     });
@@ -649,29 +651,6 @@ function initUI() {
         }
     });
     
-    /* fetch & push handlers */
-    $('#cameraSelect').focus(function () {
-        /* remember the previously selected index */
-        this._prevSelectedIndex = this.selectedIndex;
-    
-    }).change(function () {
-        if ($('#cameraSelect').val() === 'add') {
-            runAddCameraDialog();
-            this.selectedIndex = this._prevSelectedIndex;
-        }
-        else {
-            this._prevSelectedIndex = this.selectedIndex;
-            beginProgress([$(this).val()]);
-            fetchCurrentCameraConfig(endProgress);
-        }
-    });
-    $('input.main-config, select.main-config, textarea.main-config').change(function () {
-        pushMainConfig($(this).parents('tr:eq(0)').attr('reboot') == 'true');
-    });
-    $('input.camera-config, select.camera-config, textarea.camera-config').change(function () {
-        pushCameraConfig($(this).parents('tr:eq(0)').attr('reboot') == 'true');
-    });
-    
     /* streaming framerate must be >= device framerate */
     $('#framerateSlider').change(function () {
         var value = Number($('#framerateSlider').val());
@@ -709,6 +688,29 @@ function initUI() {
         updateConfigUI();
     });
     
+    /* fetch & push handlers */
+    $('#cameraSelect').focus(function () {
+        /* remember the previously selected index */
+        this._prevSelectedIndex = this.selectedIndex;
+    
+    }).change(function () {
+        if ($('#cameraSelect').val() === 'add') {
+            runAddCameraDialog();
+            this.selectedIndex = this._prevSelectedIndex;
+        }
+        else {
+            this._prevSelectedIndex = this.selectedIndex;
+            beginProgress([$(this).val()]);
+            fetchCurrentCameraConfig(endProgress);
+        }
+    });
+    $('input.main-config, select.main-config, textarea.main-config').change(function () {
+        pushMainConfig($(this).parents('tr:eq(0)').attr('reboot') == 'true');
+    });
+    $('input.camera-config, select.camera-config, textarea.camera-config').change(function () {
+        pushCameraConfig($(this).parents('tr:eq(0)').attr('reboot') == 'true');
+    });
+    
     /* preview controls */
     $('#brightnessSlider').change(function () {pushPreview('brightness');});
     $('#contrastSlider').change(function () {pushPreview('contrast');});