changes according to code review.

2 files changed, 19 insertions, 0 deletions

diff --git a/anim/controller.cpp b/anim/controller.cpp
index 94495666c2..ff3fd2a877 100644
--- a/anim/controller.cpp
+++ b/anim/controller.cpp
@@ -7,6 +7,17 @@
 
 namespace anim
 {
+  Controller::Guard::Guard(Controller * controller)
+    : m_controller(controller)
+  {
+    m_controller->Lock();
+  }
+
+  Controller::Guard::~Guard()
+  {
+    m_controller->Unlock();
+  }
+
   Controller::Controller()
   {
     m_LockCount = 0;
diff --git a/anim/controller.hpp b/anim/controller.hpp
index a26f5e2721..37ea774387 100644
--- a/anim/controller.hpp
+++ b/anim/controller.hpp
@@ -31,6 +31,14 @@ namespace anim
     static void MergeTasks(list<shared_ptr<Task> > & from, list<shared_ptr<Task> > & to);
 
   public:
+
+    struct Guard
+    {
+      Controller * m_controller;
+      Guard(Controller * controller);
+      ~Guard();
+    };
+
     // Constructor
     Controller();
     // Destructor