Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-11-18 14:08:45 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2015-11-18 14:08:45 (GMT) |
| commit | cda6fd478b3d8f7f30f771b18324db389a01b1b3 (patch) | |
| tree | 2d71e6787a0e937701968b5ce440f01c74c911ca /Swiften/StreamStack/ConnectionLayer.cpp | |
| parent | eb2cdc07f275d565b76940396381784e29125981 (diff) | |
| download | swift-cda6fd478b3d8f7f30f771b18324db389a01b1b3.zip swift-cda6fd478b3d8f7f30f771b18324db389a01b1b3.tar.bz2 | |
Fix virtual destructors and mismatching signal disconnection
Test-Information:
Unit tests pass on OS X 10.10.5.
Change-Id: I7b505513b4342001596ee8518bfdcf9e77c91479
Diffstat (limited to 'Swiften/StreamStack/ConnectionLayer.cpp')
| -rw-r--r-- | Swiften/StreamStack/ConnectionLayer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/StreamStack/ConnectionLayer.cpp b/Swiften/StreamStack/ConnectionLayer.cpp index 4546a9b..5bf07d0 100644 --- a/Swiften/StreamStack/ConnectionLayer.cpp +++ b/Swiften/StreamStack/ConnectionLayer.cpp @@ -1,23 +1,24 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/StreamStack/ConnectionLayer.h> + #include <boost/bind.hpp> namespace Swift { ConnectionLayer::ConnectionLayer(boost::shared_ptr<Connection> connection) : connection(connection) { connection->onDataRead.connect(boost::bind(&ConnectionLayer::handleDataRead, this, _1)); } ConnectionLayer::~ConnectionLayer() { - connection->onDataRead.disconnect(boost::bind(&ConnectionLayer::writeDataToParentLayer, this, _1)); + connection->onDataRead.disconnect(boost::bind(&ConnectionLayer::handleDataRead, this, _1)); } void ConnectionLayer::handleDataRead(boost::shared_ptr<SafeByteArray> data) { writeDataToParentLayer(*data); } |