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

Fix Creator crash on SSH connection loss.

Browse Source 
QTCREATORBUG-2890

Reviewed-by: dt
This commit is contained in:
Christian Kandeler
2010-10-26 16:29:27 +02:00
parent 0a679b61d4
commit efb173390a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp
View File

@@ -223,9 +223,11 @@ void MaemoSshRunner::handleUnmounted()
mount(); mount();
break; break;
case PostRunCleaning: case PostRunCleaning:
case StopRequested: case StopRequested: {
m_mounter->resetMountSpecifications(); m_mounter->resetMountSpecifications();
if (m_state == StopRequested) { const bool stopRequested = m_state == StopRequested;
setState(Inactive);
if (stopRequested) {
emit remoteProcessFinished(InvalidExitCode); emit remoteProcessFinished(InvalidExitCode);
} else if (m_exitStatus == SshRemoteProcess::ExitedNormally) { } else if (m_exitStatus == SshRemoteProcess::ExitedNormally) {
emit remoteProcessFinished(m_runner->exitCode()); emit remoteProcessFinished(m_runner->exitCode());
@@ -233,8 +235,8 @@ void MaemoSshRunner::handleUnmounted()
emit error(tr("Error running remote process: %1") emit error(tr("Error running remote process: %1")
.arg(m_runner->errorString())); .arg(m_runner->errorString()));
} }
setState(Inactive);
break; break;
}
default: ; default: ;
} }
} }
@@ -338,8 +340,8 @@ void MaemoSshRunner::setState(State newState)
void MaemoSshRunner::emitError(const QString &errorMsg) void MaemoSshRunner::emitError(const QString &errorMsg)
{ {
if (m_state != Inactive) { if (m_state != Inactive) {
emit error(errorMsg);
setState(Inactive); setState(Inactive);
emit error(errorMsg);
} }
} }