NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

qcam: Stop timer on timeout

Browse source 
Stopping the timer will reset the Timer::deadline_ field to 0 fixing
potential bugs and call QtEventDispatcher::unregisterTimer() which will
take care of the cleanup.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund 2019-09-26 20:39:51 +02:00
parent b13b134616
commit 82bf40e1f0
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/qcam/qt_event_dispatcher.cpp
View file

@ -130,10 +130,8 @@ void QtEventDispatcher::unregisterTimer(Timer *timer)
void QtEventDispatcher::timerEvent(QTimerEvent *event) void QtEventDispatcher::timerEvent(QTimerEvent *event)
{ {
auto it = timers_.find(event->timerId()); Timer *timer = timers_[event->timerId()];
timerIds_.erase(it->second); timer->stop();
killTimer(it->first);
timers_.erase(it);
} }
void QtEventDispatcher::processEvents() void QtEventDispatcher::processEvents()