feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SynchronousProcess: Show "process not responding" dialog once

Browse Source 
Change-Id: I81834452d21f3f996103fb93b3b645f4f87d6251
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Orgad Shaneh
2013-01-12 23:42:16 +02:00
committed by Orgad Shaneh
parent 724c7568cf
commit 2ab6416a34
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/synchronousprocess.cpp
View File

@@ -208,6 +208,7 @@ struct SynchronousProcessPrivate {
int m_maxHangTimerCount; int m_maxHangTimerCount;
bool m_startFailure; bool m_startFailure;
bool m_timeOutMessageBoxEnabled; bool m_timeOutMessageBoxEnabled;
bool m_waitingForUser;
QString m_binary; QString m_binary;
ChannelBuffer m_stdOut; ChannelBuffer m_stdOut;
@@ -219,7 +220,8 @@ SynchronousProcessPrivate::SynchronousProcessPrivate() :
m_hangTimerCount(0), m_hangTimerCount(0),
m_maxHangTimerCount(defaultMaxHangTimerCount), m_maxHangTimerCount(defaultMaxHangTimerCount),
m_startFailure(false), m_startFailure(false),
m_timeOutMessageBoxEnabled(false) m_timeOutMessageBoxEnabled(false),
m_waitingForUser(false)
{ {
} }
@@ -412,10 +414,12 @@ static inline bool askToKill(const QString &binary = QString())
void SynchronousProcess::slotTimeout() void SynchronousProcess::slotTimeout()
{ {
if (++d->m_hangTimerCount > d->m_maxHangTimerCount) { if (!d->m_waitingForUser && (++d->m_hangTimerCount > d->m_maxHangTimerCount)) {
if (debug) if (debug)
qDebug() << Q_FUNC_INFO << "HANG detected, killing"; qDebug() << Q_FUNC_INFO << "HANG detected, killing";
d->m_waitingForUser = true;
const bool terminate = !d->m_timeOutMessageBoxEnabled || askToKill(d->m_binary); const bool terminate = !d->m_timeOutMessageBoxEnabled || askToKill(d->m_binary);
d->m_waitingForUser = false;
if (terminate) { if (terminate) {
SynchronousProcess::stopProcess(d->m_process); SynchronousProcess::stopProcess(d->m_process);
d->m_result.result = SynchronousProcessResponse::Hang; d->m_result.result = SynchronousProcessResponse::Hang;