aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@nokia.com>2010-10-06 14:55:38 +0200
committerChristian Kandeler <christian.kandeler@nokia.com>2010-10-06 14:57:41 +0200
commitda7dd6181a3585568e75b1d29644cad4aaa612b9 (patch)
treeb1ed306c9aea04743d5cbdf60035bb1c0731716b
parent2b047a26800b41695c103a70add13c39e772f8a7 (diff)
Maemo: Make failed UTFS client upload non-fatal.
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
-rw-r--r--src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
index 3aca439313..11ad3ab24e 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
@@ -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();