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

Trk: Checking for result of file creation.

Browse Source 
Reviewed-by: con
This commit is contained in:
Robert Loehning
2009-09-28 16:56:31 +02:00
parent 3ca067ad12
commit 12536eeb9f
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,10 +129,10 @@ bool Launcher::startServer(QString *errorMessage)
d->m_device.sendTrkMessage(TrkVersions, TrkCallback(this, &Launcher::handleTrkVersion));
if (d->m_fileName.isEmpty())
return true;
if (!d->m_copyState.sourceFileName.isEmpty() && !d->m_copyState.destinationFileName.isEmpty())
copyFileToRemote();
else
if (d->m_copyState.sourceFileName.isEmpty() || d->m_copyState.destinationFileName.isEmpty())
installAndRun();
else
copyFileToRemote();
return true;
}
@@ -301,7 +301,11 @@ void Launcher::handleTrkVersion(const TrkResult &result)
void Launcher::handleFileCreation(const TrkResult &result)
{
// we don't do any error handling yet, which is bad
if (result.errorCode() || result.data.size() < 6) {
emit canNotCreateFile(d->m_copyState.destinationFileName, errorMessage(result.errorCode()));
emit finished();
return;
}
const char *data = result.data.data();
d->m_copyState.copyFileHandle = extractInt(data + 2);
QFile file(d->m_copyState.sourceFileName);