From 0f3d46b43f344abd8e158166c0e391ef404f2e2d Mon Sep 17 00:00:00 2001 From: Martin Petersson Date: Mon, 27 Feb 2012 15:41:10 +0100 Subject: QWindowsPipeWriter could terminate the process to early When the QWindowsPipeWriter is deleted it will wait for the thread to exit. This wait was set to 100 ms which will not always be enough time for the thread to exit, in that case the thread will be terminated. This will increase the timeout to 30 seconds that should be more then enough time for the thread to exit by itself. Task-number: QTBUG-4425 Change-Id: I52567066b757c2bbfda6887f504cf80de262b988 Reviewed-by: Joerg Bornemann --- src/corelib/io/qwindowspipewriter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/io/qwindowspipewriter.cpp b/src/corelib/io/qwindowspipewriter.cpp index a1765b4..8f46ff4 100644 --- a/src/corelib/io/qwindowspipewriter.cpp +++ b/src/corelib/io/qwindowspipewriter.cpp @@ -67,7 +67,7 @@ QWindowsPipeWriter::~QWindowsPipeWriter() quitNow = true; waitCondition.wakeOne(); lock.unlock(); - if (!wait(100)) + if (!wait(30000)) terminate(); #if !defined(Q_OS_WINCE) || (_WIN32_WCE >= 0x600) CloseHandle(writePipe); -- cgit v0.12