Merge ec5f191187 into 0a8f499640

frigate/video.py

@@ -64,10 +64,12 @@ def stop_ffmpeg(ffmpeg_process: sp.Popen[Any], logger: logging.Logger):
     try:
         logger.info("Waiting for ffmpeg to exit gracefully...")
         ffmpeg_process.communicate(timeout=30)
+        logger.info("FFmpeg has exited")
     except sp.TimeoutExpired:
         logger.info("FFmpeg didn't exit. Force killing...")
         ffmpeg_process.kill()
         ffmpeg_process.communicate()
+        logger.info("FFmpeg has been killed")
     ffmpeg_process = None
 
 

web/src/views/settings/TriggerView.tsx

@@ -664,9 +664,7 @@ export default function TriggerView({
                     <TableHeader className="sticky top-0 bg-muted/50">
                       <TableRow>
                         <TableHead className="w-4"></TableHead>
-                        <TableHead>
+                        <TableHead>{t("triggers.table.name")}</TableHead>
-                          {t("name", { ns: "triggers.table.name" })}
-                        </TableHead>
                         <TableHead>{t("triggers.table.type")}</TableHead>
                         <TableHead>
                           {t("triggers.table.lastTriggered")}