Merge pull request #417 from bykoianko/making-m_state-as-atomic

Bugfix. Using atomic instead of direct calls for RoutingSession::m_state which is used at least from 3 threads.

1 files changed, 2 insertions, 1 deletions

diff --git a/routing/routing_session.hpp b/routing/routing_session.hpp
index a9d14c3e45..d25a34b77c 100644
--- a/routing/routing_session.hpp
+++ b/routing/routing_session.hpp
@@ -14,6 +14,7 @@
 #include "base/deferred_task.hpp"
 #include "base/mutex.hpp"
 
+#include "std/atomic.hpp"
 #include "std/limits.hpp"
 #include "std/unique_ptr.hpp"
 
@@ -144,7 +145,7 @@ private:
 private:
   unique_ptr<AsyncRouter> m_router;
   Route m_route;
-  State m_state;
+  atomic<State> m_state;
   m2::PointD m_endPoint;
   size_t m_lastWarnedSpeedCameraIndex;
   SpeedCameraRestriction m_lastFoundCamera;