diff options
| author | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2015-06-09 16:03:50 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2015-06-23 05:47:17 +0000 |
| commit | 756d451a15e5754ced815853598f2dec3be60aec (patch) | |
| tree | 8d200cf9351c3d3af6d7d5023204f796b31326ec | |
| parent | bf24838c3344f009f9fe40f596a4eab798f071b3 (diff) | |
winrt: don't return invalidated timers in QEventDispatcherWinRT::registeredTimers
Change-Id: I0dbad7a78080cd8c18893fea8294cf540a5e9e5e
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_winrt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_winrt.cpp b/src/corelib/kernel/qeventdispatcher_winrt.cpp index 0274f35dba..eceba8d002 100644 --- a/src/corelib/kernel/qeventdispatcher_winrt.cpp +++ b/src/corelib/kernel/qeventdispatcher_winrt.cpp @@ -373,7 +373,7 @@ QList<QAbstractEventDispatcher::TimerInfo> QEventDispatcherWinRT::registeredTime Q_D(const QEventDispatcherWinRT); QList<TimerInfo> timerInfos; foreach (const WinRTTimerInfo &info, d->timerInfos) { - if (info.object == object) + if (info.object == object && info.timerId != INVALID_TIMER_ID) timerInfos.append(info); } return timerInfos; |