{"id":2073,"url":"https://patchwork.libcamera.org/api/1.1/patches/2073/?format=json","web_url":"https://patchwork.libcamera.org/patch/2073/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190930215906.1058301-2-niklas.soderlund@ragnatech.se>","date":"2019-09-30T21:59:04","name":"[libcamera-devel,v3,1/3] qcam: Fix unregister of not registered timer","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"ebc34079d91d157a69e4f8d3985072dda73c29ab","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2073/mbox/","series":[{"id":514,"url":"https://patchwork.libcamera.org/api/1.1/series/514/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=514","date":"2019-09-30T21:59:03","name":"qcam: Fix issues in the Qt event dispatcher","version":3,"mbox":"https://patchwork.libcamera.org/series/514/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2073/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2073/checks/","tags":{},"headers":{"Return-Path":"","Received":["from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D520D61656\n\tfor ;\n\tMon, 30 Sep 2019 23:59:50 +0200 (CEST)","from bismarck.berto.se (unknown [84.172.88.101])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 8fc3d3cc-e3cd-11e9-bdc3-005056917a89;\n\tMon, 30 Sep 2019 23:59:23 +0200 (CEST)"],"X-Halon-ID":"8fc3d3cc-e3cd-11e9-bdc3-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 30 Sep 2019 23:59:04 +0200","Message-Id":"<20190930215906.1058301-2-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20190930215906.1058301-1-niklas.soderlund@ragnatech.se>","References":"<20190930215906.1058301-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 1/3] 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":"Mon, 30 Sep 2019 21:59:51 -0000"},"content":"If an unregistered timer is given to QtEventDispatcher::unregisterTimer()\nan error is printed and Qt gets confused and locks up. Fix this by\nfollowing the libcamera documentation that passing a unregistered timer\nis a no-op.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \n---\n src/qcam/qt_event_dispatcher.cpp | 3 +++\n 1 file changed, 3 insertions(+)","diff":"diff --git a/src/qcam/qt_event_dispatcher.cpp b/src/qcam/qt_event_dispatcher.cpp\nindex 5ba451bf88cef6e8..98d2472c37856642 100644\n--- a/src/qcam/qt_event_dispatcher.cpp\n+++ b/src/qcam/qt_event_dispatcher.cpp\n@@ -120,6 +120,9 @@ void QtEventDispatcher::registerTimer(Timer *timer)\n void QtEventDispatcher::unregisterTimer(Timer *timer)\n {\n \tauto it = timerIds_.find(timer);\n+\tif (it == timerIds_.end())\n+\t\treturn;\n+\n \ttimers_.erase(it->second);\n \tkillTimer(it->second);\n \ttimerIds_.erase(it);\n","prefixes":["libcamera-devel","v3","1/3"]}