{"id":2023,"url":"https://patchwork.libcamera.org/api/patches/2023/?format=json","web_url":"https://patchwork.libcamera.org/patch/2023/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20190927023023.722396-2-niklas.soderlund@ragnatech.se>","date":"2019-09-27T02:30:22","name":"[libcamera-devel,1/2] qcam: Fix unregister of not registered timer","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"825ac68a6433ed85712277f36103da6b7a5b363a","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2023/mbox/","series":[{"id":507,"url":"https://patchwork.libcamera.org/api/series/507/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=507","date":"2019-09-27T02:30:21","name":"qcam: Fix issues in the Qt event dispatcher","version":1,"mbox":"https://patchwork.libcamera.org/series/507/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2023/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2023/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B297761658\n\tfor ;\n\tFri, 27 Sep 2019 04:31:33 +0200 (CEST)","from bismarck.berto.se (unknown [84.172.88.101])\n\tby bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid d929bab0-e0ce-11e9-837a-0050569116f7;\n\tFri, 27 Sep 2019 04:31:02 +0200 (CEST)"],"X-Halon-ID":"d929bab0-e0ce-11e9-837a-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 27 Sep 2019 04:30:22 +0200","Message-Id":"<20190927023023.722396-2-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20190927023023.722396-1-niklas.soderlund@ragnatech.se>","References":"<20190927023023.722396-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[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 02:31:34 -0000"},"content":"If a 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 \n---\n src/qcam/qt_event_dispatcher.cpp | 4 ++++\n 1 file changed, 4 insertions(+)","diff":"diff --git a/src/qcam/qt_event_dispatcher.cpp b/src/qcam/qt_event_dispatcher.cpp\nindex 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+\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","1/2"]}