diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-03 16:02:34 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-03 16:04:15 +0200 |
| commit | 39f90528abda2f5ec7575acf2e1a352702a202e8 (patch) | |
| tree | f9ac6387aa7d6dfa42449965f2ea120403a2e3e6 | |
| parent | 4c67500e5d14e561e37b4bdc056f059d3eefdfa4 (diff) | |
| parent | f2ef8e15dbb5496ab0a0c73644bf58b91fca49af (diff) | |
| download | qtserialport-39f90528abda2f5ec7575acf2e1a352702a202e8.tar.gz | |
Merge branch 'release' into stable
Change-Id: I82f533fb54d2c32ab0831f709320d2044eccc70e
| -rw-r--r-- | src/serialport/qserialport_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index 4da1d1d..dacd57d 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -966,7 +966,7 @@ bool QSerialPortPrivate::waitAnyEvent(int msecs, bool *timedOut, return false; } - if (int(waitResult) > (handles.count() - 1)) + if (waitResult >= DWORD(WAIT_OBJECT_0 + handles.count())) return false; HANDLE h = handles.at(waitResult - WAIT_OBJECT_0); |