summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2015-08-06 18:01:38 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2015-08-06 18:01:26 +0000
commitc513dc8e4dcde4970b3b0d2e85a38204363efd69 (patch)
treee2ac58eb94ef54ef0a90823c3de8516907424d86
parent2b32f016a437ee19a02bd41ef293750f047db1ef (diff)
downloadqtserialport-c513dc8e4dcde4970b3b0d2e85a38204363efd69.tar.gz
Delete the startAsyncWriteTimer object on close
There are no sense to keep the startAsyncWriteTimer object when the device is closed. Because in next time the device can be opened in read-only mode, and the startAsyncWriteTimer will never used. (cherry-picked from c0aebf3dfe3c6837db8f91d65ac4b6b7b44e100e) Change-Id: I315ddfa88517087dcf708b0057a0e7c27cb1a3f1 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-rw-r--r--src/serialport/qserialport_win.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp
index 73f9bab..e70fd8d 100644
--- a/src/serialport/qserialport_win.cpp
+++ b/src/serialport/qserialport_win.cpp
@@ -168,6 +168,11 @@ void QSerialPortPrivate::close()
writeCompletionNotifier = Q_NULLPTR;
}
+ if (startAsyncWriteTimer) {
+ delete startAsyncWriteTimer;
+ startAsyncWriteTimer = Q_NULLPTR;
+ }
+
readStarted = false;
readBuffer.clear();