OSDN Git Service

Maemo: Make failed UTFS client upload non-fatal.
authorChristian Kandeler <christian.kandeler@nokia.com>
Wed, 6 Oct 2010 12:55:38 +0000 (14:55 +0200)
committerChristian Kandeler <christian.kandeler@nokia.com>
Wed, 6 Oct 2010 12:57:41 +0000 (14:57 +0200)
The reason is almost always that another instance is still running,
which means the program is already there anyway.

Reviewed-by: kh1
Reviewed-by: dt
src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp

index 3aca439..11ad3ab 100644 (file)
@@ -240,9 +240,8 @@ void MaemoRemoteMounter::handleUploadFinished(Core::SftpJobId jobId,
 
     m_uploadJobId = SftpInvalidJob;
     if (!errorMsg.isEmpty()) {
-        emit error(tr("Could not upload UTFS client: %1").arg(errorMsg));
-        setState(Inactive);
-        return;
+        emit reportProgress(tr("Could not upload UTFS client (%1), continuing anyway.")
+            .arg(errorMsg));
     }
 
     startUtfsClients();