1 files changed, 13 insertions, 12 deletions
diff --git a/SwifTools/Idle/ActualIdleDetector.cpp b/SwifTools/Idle/ActualIdleDetector.cpp
index 2a99e1a..2a16fca 100644
--- a/SwifTools/Idle/ActualIdleDetector.cpp
+++ b/SwifTools/Idle/ActualIdleDetector.cpp
@@ -1,34 +1,35 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #include <SwifTools/Idle/ActualIdleDetector.h>
 
 #include <boost/bind.hpp>
-#include <iostream>
 
-#include <SwifTools/Idle/IdleQuerier.h>
 #include <Swiften/Network/Timer.h>
 #include <Swiften/Network/TimerFactory.h>
 
+#include <SwifTools/Idle/IdleQuerier.h>
+
 namespace Swift {
 
 ActualIdleDetector::ActualIdleDetector(IdleQuerier* querier, TimerFactory* timerFactory, int refreshRateMilliseconds) : querier(querier) {
-	timer = timerFactory->createTimer(refreshRateMilliseconds);
-	timer->onTick.connect(boost::bind(&ActualIdleDetector::handleTimerTick, this));
-	timer->start();
+    timer = timerFactory->createTimer(refreshRateMilliseconds);
+    timer->onTick.connect(boost::bind(&ActualIdleDetector::handleTimerTick, this));
+    timer->start();
 }
 
 ActualIdleDetector::~ActualIdleDetector() {
-	timer->stop();
+    timer->onTick.disconnect(boost::bind(&ActualIdleDetector::handleTimerTick, this));
+    timer->stop();
 }
 
 void ActualIdleDetector::handleTimerTick() {
-	timer->stop();
-	setIdle(querier->getIdleTimeSeconds() >= getIdleTimeSeconds());
-	timer->start();
+    timer->stop();
+    setIdle(querier->getIdleTimeSeconds() >= getIdleTimeSeconds());
+    timer->start();
 }
 
 }