Maemo: Fix deployment signal handling.

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
index d227fc0..104ce44 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
@@ -509,6 +509,7 @@ void MaemoDeployStep::handleMountError(const QString &errorMsg)
     case UnmountingOldDirs:
     case UnmountingCurrentDirs:
     case UnmountingCurrentMounts:
+    case Mounting:
     case StopRequested:
         raiseError(errorMsg);
         setState(Inactive);
@@ -528,6 +529,7 @@ void MaemoDeployStep::handleMountDebugOutput(const QString &output)
     case UnmountingOldDirs:
     case UnmountingCurrentDirs:
     case UnmountingCurrentMounts:
+    case Mounting:
     case StopRequested:
         writeOutput(output, ErrorOutput);
         break;
@@ -728,6 +730,7 @@ void MaemoDeployStep::handleProgressReport(const QString &progressMsg)
     case UnmountingOldDirs:
     case UnmountingCurrentDirs:
     case UnmountingCurrentMounts:
+    case Mounting:
     case StopRequested:
         writeOutput(progressMsg);
         break;

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
index 3c0d032..620c589 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
@@ -57,6 +57,7 @@ MaemoRemoteMounter::MaemoRemoteMounter(QObject *parent)
 {
     connect(m_utfsServerTimer, SIGNAL(timeout()), this,
         SLOT(handleUtfsServerTimeout()));
+    m_utfsServerTimer->setSingleShot(true);
 }
 
 MaemoRemoteMounter::~MaemoRemoteMounter()