From a2dcf2fcef6b172bb511aa10a6fe3b652816eba7 Mon Sep 17 00:00:00 2001 From: tb4jc Date: Mon, 8 May 2023 11:43:49 +0200 Subject: [PATCH] [ipcamera] Fix orphan ffmpeg process after stopping stream URL (#14909) * Setting ffmpeg reference 'ffmpegMjpeg' to null after stopping convertion to fix automatic restart of ffmpeg process. --------- Signed-off-by: Thomas Burri --- .../binding/ipcamera/internal/servlet/CameraServlet.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/servlet/CameraServlet.java b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/servlet/CameraServlet.java index 4868ed050..cfe098586 100644 --- a/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/servlet/CameraServlet.java +++ b/bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/servlet/CameraServlet.java @@ -212,6 +212,9 @@ public class CameraServlet extends IpCameraServlet { Ffmpeg localMjpeg = handler.ffmpegMjpeg; if (localMjpeg != null) { localMjpeg.stopConverting(); + // Set reference to ffmpegMjpeg to null to prevent automatic reconnection + // in handler's pollCameraRunnable() check for frozen camera + handler.ffmpegMjpeg = null; } } else { handler.closeChannel(handler.getTinyUrl(handler.mjpegUri));