diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2016-05-03 17:05:50 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2016-05-04 12:09:27 +0000 |
commit | 8a30a60a03af3979de8988209f8f77638713c30d (patch) | |
tree | 46ad4e97bb919e801bf1579cfe8eb979ff6c897c /src/serialport/qserialport_win.cpp | |
parent | 7d0d53c6a390dfbdb803ea635ef61e80588063a8 (diff) |
Remove superfluous check during removal of the pointer
... as deleting of a null-pointer it is a valid operation.
Change-Id: Ia4ffd8b69ab75b9e3b200ce2ce999ab2820b915e
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/serialport/qserialport_win.cpp')
-rw-r--r-- | src/serialport/qserialport_win.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index e356e4c9..1680d5aa 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -106,15 +106,11 @@ void QSerialPortPrivate::close() { ::CancelIo(handle); - if (notifier) { - delete notifier; - notifier = Q_NULLPTR; - } + delete notifier; + notifier = Q_NULLPTR; - if (startAsyncWriteTimer) { - delete startAsyncWriteTimer; - startAsyncWriteTimer = Q_NULLPTR; - } + delete startAsyncWriteTimer; + startAsyncWriteTimer = Q_NULLPTR; communicationStarted = false; readStarted = false; |