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

Maemo: Fix SFTP channel leak.

Browse Source 
Reviewed-by: dt
This commit is contained in:
Christian Kandeler
2010-11-08 18:14:09 +01:00
parent 90c4e23748
commit 64e47901b0
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
View File

@@ -169,18 +169,6 @@ void MaemoRemoteMounter::handleUnmountProcessFinished(int exitStatus)
void MaemoRemoteMounter::stop()
{
setState(Inactive);
if (m_utfsClientUploader) {
disconnect(m_utfsClientUploader.data(), 0, this, 0);
m_utfsClientUploader->closeChannel();
}
if (m_mountProcess) {
disconnect(m_mountProcess.data(), 0, this, 0);
m_mountProcess->closeChannel();
}
if (m_unmountProcess) {
disconnect(m_unmountProcess.data(), 0, this, 0);
m_unmountProcess->closeChannel();
}
}
void MaemoRemoteMounter::deployUtfsClient()
@@ -456,8 +444,21 @@ void MaemoRemoteMounter::assertState(const QList<State> &expectedStates,
void MaemoRemoteMounter::setState(State newState)
{
if (newState == Inactive)
if (newState == Inactive) {
m_utfsServerTimer->stop();
if (m_utfsClientUploader) {
disconnect(m_utfsClientUploader.data(), 0, this, 0);
m_utfsClientUploader->closeChannel();
}
if (m_mountProcess) {
disconnect(m_mountProcess.data(), 0, this, 0);
m_mountProcess->closeChannel();
}
if (m_unmountProcess) {
disconnect(m_unmountProcess.data(), 0, this, 0);
m_unmountProcess->closeChannel();
}
}
m_state = newState;
}