Commit 3875944c authored by Pawel Polanski's avatar Pawel Polanski

CODA: Fixed: CODA keeps handle to .SIS file

Task-number: QTCREATORBUG-4324
Reviewed-by: Kai Koehne
parent 986c9560
......@@ -588,6 +588,7 @@ void S60DeployStep::handleSymbianInstall(const Coda::CodaCommandResult &result)
void S60DeployStep::putSendNextChunk()
{
QTC_ASSERT(m_codaDevice, return);
QTC_ASSERT(m_putFile, return);
// Read and send off next chunk
const quint64 pos = m_putFile->pos();
......@@ -595,7 +596,7 @@ void S60DeployStep::putSendNextChunk()
const quint64 size = m_putFile->size();
if (data.isEmpty()) {
m_putWriteOk = true;
closeRemoteFile();
closeFiles();
setCopyProgress(100);
} else {
m_putLastChunkSize = data.size();
......@@ -609,8 +610,9 @@ void S60DeployStep::putSendNextChunk()
}
}
void S60DeployStep::closeRemoteFile()
void S60DeployStep::closeFiles()
{
m_putFile.reset();
QTC_ASSERT(m_codaDevice, return);
m_codaDevice->sendFileSystemCloseCommand(Coda::CodaCallback(this, &S60DeployStep::handleFileSystemClose),
......@@ -627,7 +629,7 @@ void S60DeployStep::handleFileSystemWrite(const Coda::CodaCommandResult &result)
}
if (!m_putWriteOk || m_putLastChunkSize < m_putChunkSize) {
closeRemoteFile();
closeFiles();
} else {
putSendNextChunk();
}
......
......@@ -171,7 +171,7 @@ private:
void handleSymbianInstall(const Coda::CodaCommandResult &result);
void handleFileSystemOpen(const Coda::CodaCommandResult &result);
void handleFileSystemWrite(const Coda::CodaCommandResult &result);
void closeRemoteFile();
void closeFiles();
void putSendNextChunk();
void handleFileSystemClose(const Coda::CodaCommandResult &result);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment