Skip to content
Snippets Groups Projects
Commit 76561b92 authored by qt-info@nokia.com's avatar qt-info@nokia.com Committed by ck
Browse files

Maemo: Check whether UTFS server could actually connect.

parent 724ecfca
No related branches found
No related tags found
No related merge requests found
...@@ -301,7 +301,8 @@ void MaemoRemoteMounter::startUtfsServers() ...@@ -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() ...@@ -313,7 +314,6 @@ void MaemoRemoteMounter::startUtfsServers()
emit error(errorMsg); emit error(errorMsg);
return; return;
} }
utfsServerProc->waitForFinished();
m_utfsServers << utfsServerProc; m_utfsServers << utfsServerProc;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment