diff options
| author | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2012-10-13 21:24:03 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-28 09:51:12 +0100 |
| commit | 63139e83915db6a81fc161158194151d624d33c6 (patch) | |
| tree | f5dcd96f50fa2e5e221bb9e9f26eb5478d9b0382 /src/nfc/qnearfieldtarget_emulator.cpp | |
| parent | fba2d218faf7a8d9d11d513092a64c9617add23a (diff) | |
Fix qnearfieldmanager test.
Test was crashing due to dereferencing an invalid iterator.
Change-Id: I912acc970de6859501e6d692a98d4c81c9673e79
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/nfc/qnearfieldtarget_emulator.cpp')
| -rw-r--r-- | src/nfc/qnearfieldtarget_emulator.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nfc/qnearfieldtarget_emulator.cpp b/src/nfc/qnearfieldtarget_emulator.cpp index a4bd888c..0a083084 100644 --- a/src/nfc/qnearfieldtarget_emulator.cpp +++ b/src/nfc/qnearfieldtarget_emulator.cpp @@ -281,7 +281,9 @@ void TagActivator::timerEvent(QTimerEvent *e) tagMutex.lock(); } - ++m_current; + if (m_current != tagMap.end()) + ++m_current; + if (m_current == tagMap.end()) m_current = tagMap.begin(); |