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

Maemo: Check whether UTFS server could actually connect.

Browse Source
This commit is contained in:
qt-info@nokia.com
2010-08-12 11:24:43 +02:00
committed by ck
parent 724ecfcafb
commit 76561b928c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
View File

@@ -301,7 +301,8 @@ void MaemoRemoteMounter::startUtfsServers()
<< (m_connection->connectionParameters().host + QLatin1Char(':') + port) << (m_connection->connectionParameters().host + QLatin1Char(':') + port)
<< mountSpec.localDir; << mountSpec.localDir;
utfsServerProc->start(utfsServer(), utfsServerArgs); utfsServerProc->start(utfsServer(), utfsServerArgs);
if (!utfsServerProc->waitForStarted()) { if (!utfsServerProc->waitForStarted()
|| !utfsServerProc->waitForFinished(5000)) {
const QByteArray &errorOutput const QByteArray &errorOutput
= utfsServerProc->readAllStandardError(); = utfsServerProc->readAllStandardError();
QString errorMsg = tr("Could not start UTFS server: %1") QString errorMsg = tr("Could not start UTFS server: %1")
@@ -313,7 +314,6 @@ void MaemoRemoteMounter::startUtfsServers()
emit error(errorMsg); emit error(errorMsg);
return; return;
} }
utfsServerProc->waitForFinished();
m_utfsServers << utfsServerProc; m_utfsServers << utfsServerProc;
} }