Move cancellation of animations from mainwindow to game

src/game.py

@@ -29,7 +29,7 @@ from sound import Voice
 from wall import Wall
 from move import Move
 from player import Players, Player, PlayingPlayer
-from animation import animateAndDo, AnimationSpeed
+from animation import animateAndDo, AnimationSpeed, ParallelAnimationGroup
 
 if os.name != 'nt':
     import resource
@@ -349,6 +349,8 @@ class Game:
         """log off from the server and return a Deferred"""
         self.wall = None
         self.lastDiscard = None
+        if Options.gui:
+            ParallelAnimationGroup.cancelAll()
 
     def playerByName(self, playerName):
         """return None or the matching player"""

src/mainwindow.py

@@ -79,7 +79,7 @@ try:
     from scoringdialog import ScoreTable, ExplainView
     from humanclient import HumanClient
     from rulesetselector import RulesetSelector
-    from animation import afterQueuedAnimations, AnimationSpeed, ParallelAnimationGroup
+    from animation import afterQueuedAnimations, AnimationSpeed
     from chat import ChatWindow
     from scene import PlayingScene, ScoringScene
     from configdialog import ConfigDialog
@@ -344,8 +344,6 @@ class MainWindow(KXmlGuiWindow):
     def close(self, unusedResult=None):
         """wrap close() because we call it with a QTimer"""
         if isAlive(self):
-            if Options.gui:
-                ParallelAnimationGroup.cancelAll()
             return KXmlGuiWindow.close(self)
         return True  # is closed