From 0178bb88e0eac442399d915ba9392530e05e1f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82?= Date: Fri, 27 Sep 2024 21:04:28 +0200 Subject: [PATCH] Fix error message on startup when camera is busy --- modules/camera/camera_feed_linux.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/camera/camera_feed_linux.cpp b/modules/camera/camera_feed_linux.cpp index 9ed8eb0d0abd..94bb2b6ad320 100644 --- a/modules/camera/camera_feed_linux.cpp +++ b/modules/camera/camera_feed_linux.cpp @@ -232,6 +232,7 @@ String CameraFeedLinux::get_device_name() const { } bool CameraFeedLinux::activate_feed() { + ERR_FAIL_COND_V_MSG(selected_format == -1, false, "CameraFeed format needs to be set before activating."); file_descriptor = open(device_name.ascii(), O_RDWR | O_NONBLOCK, 0); if (_request_buffers() && _start_capturing()) { buffer_decoder = _create_buffer_decoder(); @@ -302,16 +303,14 @@ Array CameraFeedLinux::get_formats() const { } CameraFeed::FeedFormat CameraFeedLinux::get_format() const { - return formats[selected_format]; + FeedFormat feed_format = {}; + return selected_format == -1 ? feed_format : formats[selected_format]; } bool CameraFeedLinux::set_format(int p_index, const Dictionary &p_parameters) { ERR_FAIL_COND_V_MSG(active, false, "Feed is active."); ERR_FAIL_INDEX_V_MSG(p_index, formats.size(), false, "Invalid format index."); - parameters = p_parameters.duplicate(); - selected_format = p_index; - FeedFormat feed_format = formats[p_index]; file_descriptor = open(device_name.ascii(), O_RDWR | O_NONBLOCK, 0); @@ -344,6 +343,8 @@ bool CameraFeedLinux::set_format(int p_index, const Dictionary &p_parameters) { } close(file_descriptor); + parameters = p_parameters.duplicate(); + selected_format = p_index; emit_signal(SNAME("format_changed")); return true; @@ -353,7 +354,6 @@ CameraFeedLinux::CameraFeedLinux(const String &p_device_name) : CameraFeed() { device_name = p_device_name; _query_device(device_name); - set_format(0, Dictionary()); } CameraFeedLinux::~CameraFeedLinux() {