summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@nokia.com>2010-06-07 11:50:38 +0200
committercon <qtc-committer@nokia.com>2010-06-10 10:59:06 +0200
commit3a782c6566fb11121a41425904bd8109e5571357 (patch)
tree0bd4b82f536a5444b39e0e1e312e4c3e1d9768dd
parentb1a87e84c5aa8d707f34d1df08e86b5a1f65cec4 (diff)
downloadqt-creator-3a782c6566fb11121a41425904bd8109e5571357.tar.gz
Symbian/Trk: Don't try to download a file without respective flag set.
Task-number: QTCREATORBUG-1567 Reviewed-by: Friedemann Kleint (cherry picked from commit b6ee94fb5ff652ba22b272a064c2be541b4bcf56)
-rw-r--r--src/shared/symbianutils/launcher.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/shared/symbianutils/launcher.cpp b/src/shared/symbianutils/launcher.cpp
index 25dc395935..803de7bfa9 100644
--- a/src/shared/symbianutils/launcher.cpp
+++ b/src/shared/symbianutils/launcher.cpp
@@ -446,7 +446,10 @@ void Launcher::handleResult(const TrkResult &result)
if (itemType == 0 // process
&& result.data.size() >= 10
&& d->m_session.pid == extractInt(result.data.data() + 6)) {
- copyFileFromRemote();
+ if (d->m_startupActions & ActionDownload)
+ copyFileFromRemote();
+ else
+ disconnectTrk();
}
break;
}