[Bf-blender-cvs] [7019c2b] master: Alternate fix for T42619: NULL check in caller

[Campbell Barton]

Commit: 7019c2bb7f9b8fd27e8f0cc5b72b262e2de584a9
Author: Campbell Barton
Date:   Mon Nov 17 20:07:25 2014 +0100
Branches: master
https://developer.blender.org/rB7019c2bb7f9b8fd27e8f0cc5b72b262e2de584a9

Alternate fix for T42619: NULL check in caller

Rather avoid paranoid style, (wm == NULL) is an exceptional case.

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

M	source/blender/editors/screen/screen_ops.c
M	source/blender/makesrna/intern/rna_screen.c

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

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index f8db196..4828e6e 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -3523,13 +3523,14 @@ static void SCREEN_OT_animation_step(wmOperatorType *ot)
 /* find window that owns the animation timer */
 bScreen *ED_screen_animation_playing(const wmWindowManager *wm)
 {
-	wmWindow *window;
+	wmWindow *win;
+
+	for (win = wm->windows.first; win; win = win->next) {
+		if (win->screen->animtimer) {
+			return win->screen;
+		}
+	}
 
-	if (wm)
-		for (window = wm->windows.first; window; window = window->next)
-			if (window->screen->animtimer)
-				return window->screen;
-	
 	return NULL;
 }
 
diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c
index 86a28fb..7b01acf 100644
--- a/source/blender/makesrna/intern/rna_screen.c
+++ b/source/blender/makesrna/intern/rna_screen.c
@@ -110,7 +110,9 @@ static void rna_Screen_redraw_update(Main *UNUSED(bmain), Scene *UNUSED(scene),
 
 static int rna_Screen_is_animation_playing_get(PointerRNA *UNUSED(ptr))
 {
-	return (ED_screen_animation_playing(G.main->wm.first) != NULL);
+	/* can be NULL on file load, T42619 */
+	wmWindowManager *wm = G.main->wm.first;
+	return wm ? (ED_screen_animation_playing(wm) != NULL) : 0;
 }
 
 static int rna_Screen_fullscreen_get(PointerRNA *ptr)