summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2012-12-04 15:56:42 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-12-04 17:33:59 (GMT)
commitd96f856fea35e8a8f6e426318a87f044223de8d8 (patch)
tree7050a69456b523c1810e95964784fed760deecaf /Swiften/Network/BOSHConnection.cpp
parenta6f8c4e4579b93b3e004229dcdeb098bd5b356a4 (diff)
downloadswift-contrib-d96f856fea35e8a8f6e426318a87f044223de8d8.zip
swift-contrib-d96f856fea35e8a8f6e426318a87f044223de8d8.tar.bz2
Make sure we say the session's ended after calling close() with BOSH.
Change-Id: I35b290cb75657e2d9778cc81d83c8a52693f1103 Resolves: #1184
Diffstat (limited to 'Swiften/Network/BOSHConnection.cpp')
-rw-r--r--Swiften/Network/BOSHConnection.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/Swiften/Network/BOSHConnection.cpp b/Swiften/Network/BOSHConnection.cpp
index 539109a..377373d 100644
--- a/Swiften/Network/BOSHConnection.cpp
+++ b/Swiften/Network/BOSHConnection.cpp
@@ -60,11 +60,14 @@ void BOSHConnection::cancelConnector() {
}
void BOSHConnection::disconnect() {
- cancelConnector();
- if(connection_) {
+ if (connection_) {
connection_->disconnect();
sid_ = "";
}
+ else {
+ /* handleDisconnected takes care of the connector_ as well */
+ handleDisconnected(boost::optional<Connection::Error>());
+ }
}
void BOSHConnection::restartStream() {