Merge remote-tracking branch 'origin/3.3'

2014-12-01 15:44:30 +01:00
parent 34a48645c5 d93afdeda5
commit d341c48246
55 changed files with 699 additions and 340 deletions
--- a/src/libs/ssh/sshremoteprocess.cpp
+++ b/src/libs/ssh/sshremoteprocess.cpp
@@ -31,6 +31,7 @@
 #include "sshremoteprocess.h"
 #include "sshremoteprocess_p.h"

+#include "ssh_global.h"
 #include "sshincomingpacket_p.h"
 #include "sshsendfacility_p.h"

@@ -85,6 +86,7 @@ SshRemoteProcess::SshRemoteProcess(quint32 channelId, Internal::SshSendFacility

 SshRemoteProcess::~SshRemoteProcess()
 {
+    QSSH_ASSERT(d->channelState() != Internal::AbstractSshChannel::SessionEstablished);
    close();
    delete d;
 }