[Bf-blender-cvs] [54a8753] master: Fix T39323: Animation playback is not synchronized when Screen Layout changes.

[Bastien Montagne]

Commit: 54a8753df328768a6ea0f9f8b17d77d961c52539
Author: Bastien Montagne
Date:   Fri Mar 21 15:15:24 2014 +0100
https://developer.blender.org/rB54a8753df328768a6ea0f9f8b17d77d961c52539

Fix T39323: Animation playback is not synchronized when Screen Layout changes.

Own regression in rBd2a5ea04ed84.

This commit should be included if we do a 2.70 'a' release.

===================================================================

M	source/blender/editors/screen/screen_edit.c

===================================================================

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 66fa578..23ead97 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1514,19 +1514,22 @@ void ED_screen_set(bContext *C, bScreen *sc)
 
 		/* we put timer to sleep, so screen_exit has to think there's no timer */
 		oldscreen->animtimer = NULL;
-		if (wt)
+		if (wt) {
 			WM_event_timer_sleep(wm, win, wt, true);
-		
+		}
+
 		ED_screen_exit(C, win, oldscreen);
 
 		/* Same scene, "transfer" playback to new screen. */
-		if (oldscene == sc->scene) {
-			sc->animtimer = wt;
-		}
-		/* Else, stop playback. */
-		else {
-			oldscreen->animtimer = wt;
-			ED_screen_animation_play(C, 0, 0);
+		if (wt) {
+			if (oldscene == sc->scene) {
+				sc->animtimer = wt;
+			}
+			/* Else, stop playback. */
+			else {
+				oldscreen->animtimer = wt;
+				ED_screen_animation_play(C, 0, 0);
+			}
 		}
 
 		win->screen = sc;