summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp5
-rw-r--r--src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
index ae27488e9f..e51bc93ec1 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
@@ -258,7 +258,7 @@ void MaemoRemoteMounter::startUtfsClients()
void MaemoRemoteMounter::handleUtfsClientsStarted()
{
if (!m_stop)
- startUtfsServers();
+ QTimer::singleShot(250, this, SLOT(startUtfsServers()));
}
void MaemoRemoteMounter::handleUtfsClientsFinished(int exitStatus)
@@ -282,6 +282,9 @@ void MaemoRemoteMounter::handleUtfsClientsFinished(int exitStatus)
void MaemoRemoteMounter::startUtfsServers()
{
+ if (m_stop)
+ return;
+
emit reportProgress(tr("Starting UTFS servers..."));
m_utfsServerTimer->start(30000);
for (int i = 0; i < m_mountSpecs.count(); ++i) {
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h
index 2991632542..334426a137 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h
@@ -92,11 +92,11 @@ private slots:
QProcess::ExitStatus exitStatus);
void handleUtfsServerTimeout();
void handleUtfsServerStderr();
+ void startUtfsServers();
private:
void deployUtfsClient();
void startUtfsClients();
- void startUtfsServers();
void killUtfsServer(QProcess *proc);
void killAllUtfsServers();
QString utfsClientOnDevice() const;