1 files changed, 7 insertions, 2 deletions
diff --git a/Swiften/Network/BoostTimer.h b/Swiften/Network/BoostTimer.h
index 1562887..a246b75 100644
--- a/Swiften/Network/BoostTimer.h
+++ b/Swiften/Network/BoostTimer.h
@@ -6,9 +6,11 @@
 
 #pragma once
 
-#include <boost/asio/io_service.hpp>
 #include <boost/asio/deadline_timer.hpp>
+#include <boost/asio/io_service.hpp>
 #include <boost/enable_shared_from_this.hpp>
+#include <boost/scoped_ptr.hpp>
+#include <boost/thread/mutex.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/EventLoop/EventOwner.h>
@@ -21,6 +23,8 @@ namespace Swift {
 		public:
 			typedef boost::shared_ptr<BoostTimer> ref;
 
+			virtual ~BoostTimer();
+
 			static ref create(int milliseconds, boost::shared_ptr<boost::asio::io_service> service, EventLoop* eventLoop) {
 				return ref(new BoostTimer(milliseconds, service, eventLoop));
 			}
@@ -36,7 +40,8 @@ namespace Swift {
 		private:
 			int timeout;
 			boost::shared_ptr<boost::asio::io_service> ioService;
-			boost::asio::deadline_timer timer;
+			boost::scoped_ptr<boost::asio::deadline_timer> timer;
+			boost::mutex timerMutex;
 			EventLoop* eventLoop;
 	};
 }