From d6ddf6e8c2ae9629c0b8d99e5215a91cd183cfe1 Mon Sep 17 00:00:00 2001
From: Martin Petersson <martin.petersson@nokia.com>
Date: Wed, 6 Apr 2011 16:10:34 +0200
Subject: QLocalSocket: fix abort on Windows.

The socket will not close as long as there are bytes left to write.
So by deleting the pipeWriter bytesToTrite will be 0 and the socket
will close directly.

Task-number: QTBUG-14939
Reviewed-by: Joerg Bornemann
---
 src/network/socket/qlocalsocket_win.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index b5dcb05..c4fc4c7 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -348,6 +348,11 @@ qint64 QLocalSocket::writeData(const char *data, qint64 maxSize)
 
 void QLocalSocket::abort()
 {
+    Q_D(QLocalSocket);
+    if (d->pipeWriter) {
+        delete d->pipeWriter;
+        d->pipeWriter = 0;
+    }
     close();
 }
 
-- 
cgit v0.12