patch

lbr38 · Oct 10, 2024 · d8ff39c · d8ff39c
1 parent e878db8
commit d8ff39c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 25 deletions.
diff --git a/docker/docker-compose-empty-dev.yml b/docker/docker-compose-empty-dev.yml
diff --git a/docker/init b/docker/init
@@ -6,7 +6,6 @@ GO2RTC_DIR="/var/lib/motionui/go2rtc"
 
 # Make sure motion service is stopped
 /usr/sbin/service motion stop
-killall motion
 
 /bin/bash $WWW_DIR/bin/motionui -p &
 chown -R www-data:motionui $DATA_DIR

diff --git a/www/update/database/5.0.0.php b/www/update/database/5.0.0.php
@@ -4,6 +4,7 @@
  */
 $mycameraController = new \Controllers\Camera\Camera();
 $mymotionConfigController = new \Controllers\Motion\Config();
+$mymotionServiceController = new \Controllers\Motion\Service();
 $mygo2rtcController = new \Controllers\Go2rtc\Go2rtc();
 
 /**
@@ -171,8 +172,10 @@
     }
 
     // Trigger motion restart
-    if (!file_exists(DATA_DIR . '/motion.restart')) {
-        touch(DATA_DIR . '/motion.restart');
+    if ($mymotionServiceController->isRunning() === true) {
+        if (!file_exists(DATA_DIR . '/motion.restart')) {
+            touch(DATA_DIR . '/motion.restart');
+        }
     }
 }