summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2014-09-11 12:49:27 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2014-09-11 12:52:23 +0200
commit57527c2708131da120660027b5f98df2b6d93c19 (patch)
treea9e3b33166d6aeaf6ab6ec1ad37dee3e587de904
parent38ffff88da1f0e1b2aa6e6439d6324f717f83191 (diff)
downloadqt-creator-57527c2708131da120660027b5f98df2b6d93c19.tar.gz
SSH: Do not always emit an error if an SFTP channel exits.
Channel exit is completely normal if we closed the channel, so this must not cause an error message. Change-Id: I57f5165b339a52a25118ad5e357f41334dadebc4 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r--src/libs/ssh/sftpchannel.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libs/ssh/sftpchannel.cpp b/src/libs/ssh/sftpchannel.cpp
index a1c88bb650..c69ca173f2 100644
--- a/src/libs/ssh/sftpchannel.cpp
+++ b/src/libs/ssh/sftpchannel.cpp
@@ -302,6 +302,9 @@ void SftpChannelPrivate::handleExitStatus(const SshChannelExitStatus &exitStatus
qDebug("Remote SFTP service exited with exit code %d", exitStatus.exitStatus);
#endif
+ if (channelState() == CloseRequested || channelState() == Closed)
+ return;
+
emit channelError(tr("The SFTP server finished unexpectedly with exit code %1.")
.arg(exitStatus.exitStatus));