- ignore calls to WM_cursor_wait() in background mode (crashes saving blend files)

- rename curve enum value align CENTRAL to CENTER

1 files changed, 10 insertions, 8 deletions

diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c
index 43352f4efd2..8998c9624e5 100644
--- a/source/blender/windowmanager/intern/wm_cursors.c
+++ b/source/blender/windowmanager/intern/wm_cursors.c
@@ -155,14 +155,16 @@ void WM_cursor_restore(wmWindow *win)
 /* to allow usage all over, we do entire WM */
 void WM_cursor_wait(int val)
 {
-	wmWindowManager *wm= G.main->wm.first;
-	wmWindow *win= wm?wm->windows.first:NULL; 
-	
-	for(; win; win= win->next) {
-		if(val) {
-			WM_cursor_modal(win, CURSOR_WAIT);
-		} else {
-			WM_cursor_restore(win);
+	if(!G.background) {
+		wmWindowManager *wm= G.main->wm.first;
+		wmWindow *win= wm?wm->windows.first:NULL; 
+		
+		for(; win; win= win->next) {
+			if(val) {
+				WM_cursor_modal(win, CURSOR_WAIT);
+			} else {
+				WM_cursor_restore(win);
+			}
 		}
 	}
 }