Merge pull request #1201 from chaosphere2112/fix_1195

Fix for #1195
CDAT · Apr 8, 2015 · dd7c087 · dd7c087
2 parents 4b3a916 + bbeab93
commit dd7c087
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/Packages/vcs/Lib/configurator.py b/Packages/vcs/Lib/configurator.py
@@ -521,9 +521,13 @@ def get_frame():
             self.initialized = True
 
     def step_forward(self, state):
+        if self.animation_timer is not None:
+            self.stop_animating()
         self.canvas.animate.draw_frame((self.canvas.animate.frame_num + 1) % self.canvas.animate.number_of_frames(), allow_static = False, render_offscreen = False)
 
     def step_back(self, state):
+        if self.animation_timer is not None:
+            self.stop_animating()
         self.canvas.animate.draw_frame((self.canvas.animate.frame_num - 1) % self.canvas.animate.number_of_frames(), allow_static = False, render_offscreen = False)
 
     def save_animation_press(self, state):
@@ -607,8 +611,11 @@ def stop_animating(self):
         if self.animation_timer is not None:
             t, self.animation_timer = self.animation_timer, None
             self.interactor.DestroyTimer(t)
+            self.anim_button.set_state(0)
 
     def set_animation_frame(self, value):
+        if self.animation_timer is not None:
+            self.stop_animating()
         value = int(value)
         self.canvas.animate.draw_frame(value, allow_static=False, render_offscreen=False)
         return value