From fd22d11d9b920c90203be70e983543663fd8a2d3 Mon Sep 17 00:00:00 2001 From: Patrick Gehrsitz Date: Sun, 7 Jan 2024 17:29:33 +0100 Subject: [PATCH] fix: fix crash with brokenfocus and camera-streamer (#224) If one cam with `ustreamer` is defined it will run `brokenfocus` for every cam defined. This will lead to a crash with `brokenfocus` devices with mode `camera-streamer`. This PR fixes this issue and will only run `brokenfocus` for devices with mode `ustreamer`. --- libs/ustreamer.sh | 2 +- libs/v4l2_control.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/ustreamer.sh b/libs/ustreamer.sh index 3f588ee..e4c7c45 100755 --- a/libs/ustreamer.sh +++ b/libs/ustreamer.sh @@ -24,7 +24,7 @@ run_mjpg() { run_ustreamer "${instance}" & done blockyfix - brokenfocus + brokenfocus "${cams}" return } diff --git a/libs/v4l2_control.sh b/libs/v4l2_control.sh index d763021..167fc3a 100755 --- a/libs/v4l2_control.sh +++ b/libs/v4l2_control.sh @@ -116,7 +116,7 @@ function brokenfocus { function main { local cur_val conf_val device - for cam in $(configured_cams); do + for cam in ${1}; do device="$(get_param "cam ${cam}" device)" cur_val="$(get_current_value "${device}")" conf_val="$(get_conf_value "${cam}")" @@ -133,7 +133,7 @@ function brokenfocus { } ### MAIN -main +main "${1}" }