From 76561b928c285b4edefb65bf12b4d3788afd9eb6 Mon Sep 17 00:00:00 2001
From: "qt-info@nokia.com" <qt-info@nokia.com>
Date: Thu, 12 Aug 2010 11:24:43 +0200
Subject: [PATCH] Maemo: Check whether UTFS server could actually connect.
---
src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
index 79f4c4e6900..48ef3c836cf 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
@@ -301,7 +301,8 @@ void MaemoRemoteMounter::startUtfsServers()
<< (m_connection->connectionParameters().host + QLatin1Char(':') + port)
<< mountSpec.localDir;
utfsServerProc->start(utfsServer(), utfsServerArgs);
- if (!utfsServerProc->waitForStarted()) {
+ if (!utfsServerProc->waitForStarted()
+ || !utfsServerProc->waitForFinished(5000)) {
const QByteArray &errorOutput
= utfsServerProc->readAllStandardError();
QString errorMsg = tr("Could not start UTFS server: %1")
@@ -313,7 +314,6 @@ void MaemoRemoteMounter::startUtfsServers()
emit error(errorMsg);
return;
}
- utfsServerProc->waitForFinished();
m_utfsServers << utfsServerProc;
}
--
GitLab