From 3875944c2a39a6a481d0241553a451cd96c60f20 Mon Sep 17 00:00:00 2001
From: Pawel Polanski <pawel.3.polanski@nokia.com>
Date: Fri, 8 Apr 2011 12:01:38 +0200
Subject: CODA: Fixed: CODA keeps handle to .SIS file

Task-number: QTCREATORBUG-4324
Reviewed-by: Kai Koehne
---
 src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp | 8 +++++---
 src/plugins/qt4projectmanager/qt-s60/s60deploystep.h   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
index 931a0d41c8..cb5eeb5dbd 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
@@ -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();
     }
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
index 855164a9ac..706e0d07a9 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
@@ -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);
 
-- 
cgit v1.2.1