onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-15 09:29:36 +02:00
Code Issues Releases Wiki Activity

fixed installer crash on windows: background process sends "finished()" signal when we call QApplication::processEvents(), need to check for this condition.

Browse Source
This commit is contained in:
SVN User
2010-04-29 22:07:11 +00:00
parent e0d7f16a1f
commit 01d8eef67e
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 2857
#define BUILD_NUM 2860
src/gui/SSHSession.cpp
+22 -10
View File
@@ -279,7 +279,8 @@ void SSHSession::terminate()
if (proc->state() == QProcess::Running)
{
if (fwbdebug)
qDebug() << "SSHSession::terminate waiting for pending signal 'finished()', if any";
qDebug() << "SSHSession::terminate "
<< "waiting for pending signal 'finished()', if any";
// this processes events and lets QProcess send signal finished()
// in case user hit Cancel at just right time when background process
// already exited but QProcess has not noticed this yet.
@@ -287,8 +288,8 @@ void SSHSession::terminate()
}
// If QProcess sent signal finished() while we were waiting in
// waitForFinished(), the signal has been processed in SSHSession::finished
// and proc has already been deleted.
// waitForFinished(), the signal has been processed in
// SSHSession::finished and proc has already been deleted.
if (proc == NULL)
{
@@ -306,7 +307,8 @@ void SSHSession::terminate()
{
Q_PID pid = proc->pid();
if (fwbdebug)
qDebug() << "SSHSession::terminate terminating child process pid=" << pid;
qDebug() << "SSHSession::terminate "
<< "terminating child process pid=" << pid;
emit printStdout_sign(tr("Stopping background process"));
@@ -325,12 +327,15 @@ void SSHSession::terminate()
#endif
if (fwbdebug)
qDebug() << "SSHSession::terminate terminate signal sent, waiting for it to finish";
qDebug() << "SSHSession::terminate terminate signal sent,"
<< "waiting for it to finish";
int time_to_wait = 20;
for (int timeout = 0; timeout < time_to_wait; timeout++)
for (int timeout = 0; proc != NULL &&
proc->state() == QProcess::Running &&
timeout < time_to_wait;
timeout++)
{
if (proc==NULL || proc->state() != QProcess::Running) break;
// print countdown only if we've been waiting more than 3 sec
if (timeout > 3)
emit printStdout_sign(
@@ -345,8 +350,11 @@ void SSHSession::terminate()
emit printStdout_sign(s);
}
QApplication::processEvents(QEventLoop::ExcludeUserInputEvents,1);
proc->waitForFinished(1000);
QApplication::processEvents(
QEventLoop::ExcludeUserInputEvents,1);
// check if proc is still running after we processed events
if (proc != NULL) proc->waitForFinished(1000);
}
// proc can be NULL at this point if it had sent signal finished()
@@ -358,7 +366,8 @@ void SSHSession::terminate()
}
if (fwbdebug)
qDebug() << "SSHSession::terminate Reading last output buffers";
qDebug() << "SSHSession::terminate "
<< "Reading last output buffers";
QString s = QString(proc->readAllStandardOutput());
if (!quiet)
@@ -619,6 +628,7 @@ void SSHSession::sessionComplete(bool err)
emit sessionFatalError_sign();
else
emit sessionFinished_sign();
if (fwbdebug) qDebug("SSHSession::sessionComplete done");
}
void SSHSession::finished(int retcode)
@@ -644,6 +654,8 @@ void SSHSession::finished(int retcode)
emit printStdout_sign(tr("SSH session terminated, exit status: %1").arg(
retcode) + "\n");
sessionComplete( retcode!=0 );
if (fwbdebug) qDebug("SSHSession::processExited done");
// if (retcode) error=true;
// emit sessionFinished_sign();
}