2 files changed, 13 insertions, 3 deletions
diff --git a/Swiften/StreamStack/WhitespacePingLayer.cpp b/Swiften/StreamStack/WhitespacePingLayer.cpp
index 00b931b..5ea5423 100644
--- a/Swiften/StreamStack/WhitespacePingLayer.cpp
+++ b/Swiften/StreamStack/WhitespacePingLayer.cpp
@@ -1,47 +1,56 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/StreamStack/WhitespacePingLayer.h>
 
 #include <boost/bind.hpp>
 
-#include <Swiften/Network/TimerFactory.h>
+#include <Swiften/Base/Log.h>
 #include <Swiften/Network/Timer.h>
+#include <Swiften/Network/TimerFactory.h>
 
 namespace Swift {
 
 static const int TIMEOUT_MILLISECONDS = 60000;
 
 WhitespacePingLayer::WhitespacePingLayer(TimerFactory* timerFactory) : isActive(false) {
 	timer = timerFactory->createTimer(TIMEOUT_MILLISECONDS);
 	timer->onTick.connect(boost::bind(&WhitespacePingLayer::handleTimerTick, this));
 }
 
+WhitespacePingLayer::~WhitespacePingLayer() {
+	SWIFT_LOG_ASSERT(!isActive, debug) << "WhitespacePingLayer still active at destruction." << std::endl;
+	if (isActive) {
+		timer->stop();
+	}
+	timer->onTick.disconnect(boost::bind(&WhitespacePingLayer::handleTimerTick, this));
+}
+
 void WhitespacePingLayer::writeData(const SafeByteArray& data) {
 	writeDataToChildLayer(data);
 }
 
 void WhitespacePingLayer::handleDataRead(const SafeByteArray& data) {
 	writeDataToParentLayer(data);
 }
 
 void WhitespacePingLayer::handleTimerTick() {
 	timer->stop();
 	writeDataToChildLayer(createSafeByteArray(" "));
 	timer->start();
 }
 
 void WhitespacePingLayer::setActive() {
 	isActive = true;
 	timer->start();
 }
 
 void WhitespacePingLayer::setInactive() {
 	timer->stop();
 	isActive = false;
 }
 
 }
diff --git a/Swiften/StreamStack/WhitespacePingLayer.h b/Swiften/StreamStack/WhitespacePingLayer.h
index 17b0654..7ed56ca 100644
--- a/Swiften/StreamStack/WhitespacePingLayer.h
+++ b/Swiften/StreamStack/WhitespacePingLayer.h
@@ -1,39 +1,40 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/StreamStack/StreamLayer.h>
 
 namespace Swift {
 	class Timer;
 	class TimerFactory;
 
 	class SWIFTEN_API WhitespacePingLayer : public StreamLayer, boost::noncopyable {
 		public:
 			WhitespacePingLayer(TimerFactory* timerFactory);
+			virtual ~WhitespacePingLayer();
 
 			void setActive();
 			void setInactive();
 			void writeData(const SafeByteArray& data);
 			void handleDataRead(const SafeByteArray& data);
 
 			bool getIsActive() const {
 				return isActive;
 			}
 
 		private:
 			void handleTimerTick();
 
 		private:
 			bool isActive;
 			boost::shared_ptr<Timer> timer;
 	};
 }