[{"id":2705,"web_url":"https://patchwork.libcamera.org/comment/2705/","msgid":"<20190927121331.GE4862@pendragon.ideasonboard.com>","date":"2019-09-27T12:13:31","subject":"Re: [libcamera-devel] [PATCH 1/2] qcam: Fix unregister of not\n\tregistered timer","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Fri, Sep 27, 2019 at 04:30:22AM +0200, Niklas Söderlund wrote:\n> If a unregistered timer is given to QtEventDispatcher::unregisterTimer()\n\ns/If a/If an/\n\n> an error is printed and Qt gets confused and locks up. Fix this by\n> following the libcamera documentation that passing a unregistered timer\n> is a no-op.\n> \n> Signed-off-by: Niklas Söderlund \n> ---\n> src/qcam/qt_event_dispatcher.cpp | 4 ++++\n> 1 file changed, 4 insertions(+)\n> \n> diff --git a/src/qcam/qt_event_dispatcher.cpp b/src/qcam/qt_event_dispatcher.cpp\n> index 5ba451bf88cef6e8..6b332f6265d01fe0 100644\n> --- a/src/qcam/qt_event_dispatcher.cpp\n> +++ b/src/qcam/qt_event_dispatcher.cpp\n> @@ -120,6 +120,10 @@ void QtEventDispatcher::registerTimer(Timer *timer)\n> void QtEventDispatcher::unregisterTimer(Timer *timer)\n> {\n> \tauto it = timerIds_.find(timer);\n> +\n\nNitpicking, I'd remove this blank line.\n\nReviewed-by: Laurent Pinchart \n\n> +\tif (it == timerIds_.end())\n> +\t\treturn;\n> +\n> \ttimers_.erase(it->second);\n> \tkillTimer(it->second);\n> \ttimerIds_.erase(it);","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DCF2D60BE8\n\tfor ;\n\tFri, 27 Sep 2019 14:13:49 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4B1FB741;\n\tFri, 27 Sep 2019 14:13:49 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1569586429;\n\tbh=vE7z99QkwlmDxXIiwqtNY9vaLcdSRavaJlDdzTIA2MQ=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=TJKpZsu10xdMSVO+tgswRn19cQEYm9NlmcQS36ThYg38UBD9BR62gf+/rSEqlOxqW\n\tAKl/0Rw9tZ04KHqAdlHcg/SAuvqGQ+VbbIgf6nkq2wZuNG/v6erEc7J8+qrOUjMWFS\n\tXTHdfbUdEW/+EM51Ozw/lMF/YvCZ+3r9oR9xEyN0=","Date":"Fri, 27 Sep 2019 15:13:31 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190927121331.GE4862@pendragon.ideasonboard.com>","References":"<20190927023023.722396-1-niklas.soderlund@ragnatech.se>\n\t<20190927023023.722396-2-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190927023023.722396-2-niklas.soderlund@ragnatech.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 1/2] qcam: Fix unregister of not\n\tregistered timer","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 27 Sep 2019 12:13:50 -0000"}}]