2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Network/BoostConnection.cpp b/Swiften/Network/BoostConnection.cpp
index ff53289..f837b50 100644
--- a/Swiften/Network/BoostConnection.cpp
+++ b/Swiften/Network/BoostConnection.cpp
@@ -42,7 +42,6 @@ BoostConnection::BoostConnection(boost::asio::io_service* ioService) :
 }
 
 BoostConnection::~BoostConnection() {
-	MainEventLoop::removeEventsFromOwner(shared_from_this());
 }
 
 void BoostConnection::listen() {
@@ -65,6 +64,7 @@ void BoostConnection::connect(const String& domain) {
 }
 
 void BoostConnection::disconnect() {
+	//MainEventLoop::removeEventsFromOwner(shared_from_this());
 	socket_.close();
 }
 
diff --git a/Swiften/Network/Timer.cpp b/Swiften/Network/Timer.cpp
index bab41e4..8999113 100644
--- a/Swiften/Network/Timer.cpp
+++ b/Swiften/Network/Timer.cpp
@@ -12,7 +12,7 @@ Timer::Timer(int milliseconds) :
 }
 
 Timer::~Timer() {
-	MainEventLoop::removeEventsFromOwner(shared_from_this());
+	//MainEventLoop::removeEventsFromOwner(shared_from_this());
   ioService_->stop();
   thread_->join();
 	delete timer_;