From da7dd6181a3585568e75b1d29644cad4aaa612b9 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 6 Oct 2010 14:55:38 +0200 Subject: 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 --- src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp | 5 ++--- 1 file 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(); -- cgit v1.2.3