3 files changed, 9 insertions, 13 deletions
diff --git a/src/network/socket/qlocalsocket.cpp b/src/network/socket/qlocalsocket.cpp
index 12b9f45a14..fba7f75663 100644
--- a/src/network/socket/qlocalsocket.cpp
+++ b/src/network/socket/qlocalsocket.cpp
@@ -397,7 +397,7 @@ QLocalSocket::QLocalSocket(QObject * parent)
  */
 QLocalSocket::~QLocalSocket()
 {
-    QLocalSocket::close();
+    abort();
 #if !defined(Q_OS_WIN) && !defined(QT_LOCALSOCKET_TCP)
     Q_D(QLocalSocket);
     d->unixSocket.setParent(nullptr);
diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h
index 8dd71ece54..036ce48885 100644
--- a/src/network/socket/qlocalsocket_p.h
+++ b/src/network/socket/qlocalsocket_p.h
@@ -132,7 +132,6 @@ public:
     void _q_errorOccurred(QAbstractSocket::SocketError newError);
 #elif defined(Q_OS_WIN)
     ~QLocalSocketPrivate();
-    void destroyPipeHandles();
     qint64 pipeWriterBytesToWrite() const;
     void _q_canRead();
     void _q_bytesWritten(qint64 bytes);
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index 59d628d4d6..bd299d6cf5 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -161,15 +161,9 @@ QLocalSocketPrivate::QLocalSocketPrivate() : QIODevicePrivate(),
 
 QLocalSocketPrivate::~QLocalSocketPrivate()
 {
-    destroyPipeHandles();
-}
-
-void QLocalSocketPrivate::destroyPipeHandles()
-{
-    if (handle != INVALID_HANDLE_VALUE) {
-        DisconnectNamedPipe(handle);
-        CloseHandle(handle);
-    }
+    Q_ASSERT(state == QLocalSocket::UnconnectedState);
+    Q_ASSERT(handle == INVALID_HANDLE_VALUE);
+    Q_ASSERT(pipeWriter == nullptr);
 }
 
 void QLocalSocket::connectToServer(OpenMode openMode)
@@ -346,8 +340,11 @@ void QLocalSocketPrivate::_q_pipeClosed()
     pipeReader->stop();
     delete pipeWriter;
     pipeWriter = nullptr;
-    destroyPipeHandles();
-    handle = INVALID_HANDLE_VALUE;
+    if (handle != INVALID_HANDLE_VALUE) {
+        DisconnectNamedPipe(handle);
+        CloseHandle(handle);
+        handle = INVALID_HANDLE_VALUE;
+    }
 
     state = QLocalSocket::UnconnectedState;
     emit q->stateChanged(state);