2 files changed, 27 insertions, 8 deletions
diff --git a/Swiften/Network/BoostTimer.cpp b/Swiften/Network/BoostTimer.cpp
index dd6bd0d..30f5180 100644
--- a/Swiften/Network/BoostTimer.cpp
+++ b/Swiften/Network/BoostTimer.cpp
@@ -1,32 +1,46 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
 #include <Swiften/Network/BoostTimer.h>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <Swiften/EventLoop/EventLoop.h>
 namespace Swift {
 BoostTimer::BoostTimer(int milliseconds, boost::shared_ptr<boost::asio::io_service> service, EventLoop* eventLoop) :
-                timeout(milliseconds), ioService(service), timer(*service), eventLoop(eventLoop) {
+                timeout(milliseconds), ioService(service), eventLoop(eventLoop) {
+                timer.reset(new boost::asio::deadline_timer(*service));
+}
+BoostTimer::~BoostTimer() {
+        {
+                boost::mutex::scoped_lock lockTimer(timerMutex);
+                timer.reset();
+        }
 }
 void BoostTimer::start() {
-        timer.expires_from_now(boost::posix_time::milliseconds(timeout));
+        {
-        timer.async_wait(boost::bind(&BoostTimer::handleTimerTick, shared_from_this(), boost::asio::placeholders::error));
+                boost::mutex::scoped_lock lockTimer(timerMutex);
+                timer->expires_from_now(boost::posix_time::milliseconds(timeout));
+                timer->async_wait(boost::bind(&BoostTimer::handleTimerTick, shared_from_this(), boost::asio::placeholders::error));
+        }
 }
 void BoostTimer::stop() {
-        timer.cancel();
+        {
+                boost::mutex::scoped_lock lockTimer(timerMutex);
+                timer->cancel();
+        }
        eventLoop->removeEventsFromOwner(shared_from_this());
 }
 void BoostTimer::handleTimerTick(const boost::system::error_code& error) {
        if (error) {
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
@@ -4,13 +4,15 @@
 * See the COPYING file for more information.
 */
 #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>
 #include <Swiften/Network/Timer.h>
@@ -19,10 +21,12 @@ namespace Swift {
        class SWIFTEN_API BoostTimer : public Timer, public EventOwner, public boost::enable_shared_from_this<BoostTimer> {
                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));
                        }
                        virtual void start();
@@ -34,9 +38,10 @@ namespace Swift {
                        void handleTimerTick(const boost::system::error_code& error);
                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;
        };
 }