Commit d2a96312 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Maemo: Fix deployment signal handling.

parent e601b3c7
...@@ -509,6 +509,7 @@ void MaemoDeployStep::handleMountError(const QString &errorMsg) ...@@ -509,6 +509,7 @@ void MaemoDeployStep::handleMountError(const QString &errorMsg)
case UnmountingOldDirs: case UnmountingOldDirs:
case UnmountingCurrentDirs: case UnmountingCurrentDirs:
case UnmountingCurrentMounts: case UnmountingCurrentMounts:
case Mounting:
case StopRequested: case StopRequested:
raiseError(errorMsg); raiseError(errorMsg);
setState(Inactive); setState(Inactive);
...@@ -528,6 +529,7 @@ void MaemoDeployStep::handleMountDebugOutput(const QString &output) ...@@ -528,6 +529,7 @@ void MaemoDeployStep::handleMountDebugOutput(const QString &output)
case UnmountingOldDirs: case UnmountingOldDirs:
case UnmountingCurrentDirs: case UnmountingCurrentDirs:
case UnmountingCurrentMounts: case UnmountingCurrentMounts:
case Mounting:
case StopRequested: case StopRequested:
writeOutput(output, ErrorOutput); writeOutput(output, ErrorOutput);
break; break;
...@@ -728,6 +730,7 @@ void MaemoDeployStep::handleProgressReport(const QString &progressMsg) ...@@ -728,6 +730,7 @@ void MaemoDeployStep::handleProgressReport(const QString &progressMsg)
case UnmountingOldDirs: case UnmountingOldDirs:
case UnmountingCurrentDirs: case UnmountingCurrentDirs:
case UnmountingCurrentMounts: case UnmountingCurrentMounts:
case Mounting:
case StopRequested: case StopRequested:
writeOutput(progressMsg); writeOutput(progressMsg);
break; break;
......
...@@ -57,6 +57,7 @@ MaemoRemoteMounter::MaemoRemoteMounter(QObject *parent) ...@@ -57,6 +57,7 @@ MaemoRemoteMounter::MaemoRemoteMounter(QObject *parent)
{ {
connect(m_utfsServerTimer, SIGNAL(timeout()), this, connect(m_utfsServerTimer, SIGNAL(timeout()), this,
SLOT(handleUtfsServerTimeout())); SLOT(handleUtfsServerTimeout()));
m_utfsServerTimer->setSingleShot(true);
} }
MaemoRemoteMounter::~MaemoRemoteMounter() MaemoRemoteMounter::~MaemoRemoteMounter()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment