feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Trk: Checking result of TrkCloseFile

Browse Source
This commit is contained in:
Robert Loehning
2009-10-06 12:29:43 +02:00
parent 319a0e2ad1
commit 44f224ac53
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/trk/launcher.cpp
View File

@@ -297,8 +297,11 @@ void Launcher::handleResult(const TrkResult &result)
void Launcher::handleTrkVersion(const TrkResult &result)
{
if (result.errorCode() || result.data.size() < 5)
if (result.errorCode() || result.data.size() < 5) {
if (d->m_startupActions == ActionPingOnly)
emit finished();
return;
}
const int trkMajor = result.data.at(1);
const int trkMinor = result.data.at(2);
const int protocolMajor = result.data.at(3);
@@ -377,7 +380,8 @@ void Launcher::closeRemoteFile(bool failed)
void Launcher::handleFileCopied(const TrkResult &result)
{
Q_UNUSED(result)
if (result.errorCode())
emit canNotCloseFile(d->m_copyState.destinationFileName, result.errorString());
if (d->m_startupActions & ActionInstall)
installRemotePackageSilently();
else if (d->m_startupActions & ActionRun)