diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-07-28 09:04:21 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-30 08:06:52 +0000 |
commit | ed08b11f63f280d383bf9bf7a4aeabe0a1813561 (patch) | |
tree | ed064b9458bf68a0a64de201a74700d9c1fda682 | |
parent | dbc5dcbb411f253a6ba55fd5e2cef413698b0a91 (diff) |
Pixeltool: Fix warning about invalid timer id in killTimer()
Make sure ids of timers are reset to 0, fixing:
QObject::killTimer(): Error: timer id 32766 is not valid for object 0x7ffee8ce3af0 (QPixelTool, ), timer has not been killed
when zooming.
Change-Id: I47fe730df853e50e6d11a09c7d77488e1d41fcc5
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit b6c9e72db4b21829e0dfbb22d37ba0c734b552f0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/pixeltool/qpixeltool.cpp | 5 | ||||
-rw-r--r-- | src/pixeltool/qpixeltool.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp index 868f3707b..760c3f01e 100644 --- a/src/pixeltool/qpixeltool.cpp +++ b/src/pixeltool/qpixeltool.cpp @@ -108,9 +108,11 @@ void QPixelTool::timerEvent(QTimerEvent *event) grabScreen(); } else if (event->timerId() == m_displayZoomId) { killTimer(m_displayZoomId); + m_displayZoomId = 0; setZoomVisible(false); } else if (event->timerId() == m_displayGridSizeId) { killTimer(m_displayGridSizeId); + m_displayGridSizeId = 0; m_displayGridSize = false; } } @@ -562,9 +564,8 @@ void QPixelTool::grabScreen() void QPixelTool::startZoomVisibleTimer() { - if (m_displayZoomId > 0) { + if (m_displayZoomId > 0) killTimer(m_displayZoomId); - } m_displayZoomId = startTimer(5000); setZoomVisible(true); } diff --git a/src/pixeltool/qpixeltool.h b/src/pixeltool/qpixeltool.h index 3fa9f1e7e..6d35f516f 100644 --- a/src/pixeltool/qpixeltool.h +++ b/src/pixeltool/qpixeltool.h @@ -92,7 +92,7 @@ private: int m_lcdMode; int m_updateId; - int m_displayZoomId; + int m_displayZoomId = 0; int m_displayGridSizeId = 0; QRgb m_currentColor = 0; |