diff options
| author | Martin Petersson <Martin.Petersson@nokia.com> | 2012-02-27 14:41:10 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-28 10:00:56 (GMT) |
| commit | 0f3d46b43f344abd8e158166c0e391ef404f2e2d (patch) | |
| tree | 97de42d558088fa739b28e108618b855b8824763 /src/corelib | |
| parent | f323f01648a33a22ba2b0f4975efe19a1af1b9b5 (diff) | |
| download | Qt-0f3d46b43f344abd8e158166c0e391ef404f2e2d.zip Qt-0f3d46b43f344abd8e158166c0e391ef404f2e2d.tar.gz Qt-0f3d46b43f344abd8e158166c0e391ef404f2e2d.tar.bz2 | |
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 <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qwindowspipewriter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |