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

Maemo: State machine bugfixes in remote process execution.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
Christian Kandeler
2010-10-06 15:51:13 +02:00
parent 983bc5d248
commit 26808a4beb
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ void MaemoSshRunner::handleConnected()
void MaemoSshRunner::handleConnectionFailure() void MaemoSshRunner::handleConnectionFailure()
{ {
if (m_state != Inactive) if (m_state == Inactive)
qWarning("Unexpected state %d in %s.", m_state, Q_FUNC_INFO); qWarning("Unexpected state %d in %s.", m_state, Q_FUNC_INFO);
const QString errorTemplate = m_state == Connecting const QString errorTemplate = m_state == Connecting
@@ -165,8 +165,10 @@ void MaemoSshRunner::handleCleanupFinished(int exitStatus)
|| exitStatus == SshRemoteProcess::ExitedNormally); || exitStatus == SshRemoteProcess::ExitedNormally);
ASSERT_STATE(QList<State>() << PreRunCleaning << PostRunCleaning ASSERT_STATE(QList<State>() << PreRunCleaning << PostRunCleaning
<< StopRequested); << StopRequested << Inactive);
if (m_state == Inactive)
return;
if (m_state == StopRequested || m_state == PostRunCleaning) { if (m_state == StopRequested || m_state == PostRunCleaning) {
unmount(); unmount();
return; return;
@@ -247,7 +249,7 @@ void MaemoSshRunner::handleMounted()
void MaemoSshRunner::handleMounterError(const QString &errorMsg) void MaemoSshRunner::handleMounterError(const QString &errorMsg)
{ {
ASSERT_STATE(QList<State>() << PreRunCleaning << PostRunCleaning ASSERT_STATE(QList<State>() << PreRunCleaning << PostRunCleaning
<< PreMountUnmounting << Mounting << StopRequested); << PreMountUnmounting << Mounting << StopRequested << Inactive);
emitError(errorMsg); emitError(errorMsg);
} }
@@ -279,10 +281,10 @@ void MaemoSshRunner::handleRemoteProcessFinished(int exitStatus)
Q_ASSERT(exitStatus == SshRemoteProcess::FailedToStart Q_ASSERT(exitStatus == SshRemoteProcess::FailedToStart
|| exitStatus == SshRemoteProcess::KilledBySignal || exitStatus == SshRemoteProcess::KilledBySignal
|| exitStatus == SshRemoteProcess::ExitedNormally); || exitStatus == SshRemoteProcess::ExitedNormally);
ASSERT_STATE(QList<State>() << ProcessStarting << StopRequested); ASSERT_STATE(QList<State>() << ProcessStarting << StopRequested << Inactive);
m_exitStatus = exitStatus; m_exitStatus = exitStatus;
if (m_state != StopRequested) { if (m_state != StopRequested && m_state != Inactive) {
setState(PostRunCleaning); setState(PostRunCleaning);
cleanup(); cleanup();
} }