[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57842] trunk/blender/source/blender/ editors/screen: avoid crashes running screendump and screen editing operators in background mode .

[Campbell Barton]

Revision: 57842
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57842
Author:   campbellbarton
Date:     2013-06-28 05:39:05 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
avoid crashes running screendump and screen editing operators in background mode. (not that these would be useful but better not crash)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_ops.c
    trunk/blender/source/blender/editors/screen/screendump.c

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2013-06-28 00:01:37 UTC (rev 57841)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2013-06-28 05:39:05 UTC (rev 57842)
@@ -599,13 +599,12 @@
 	wmWindow *win = CTX_wm_window(C);
 	ScrArea *sa = CTX_wm_area(C);
 	
-	if (sa && win) {
+	if (sa && win && win->eventstate) {
+		const int *xy = &win->eventstate->x;
 		AZone *az;
-		int x = win->eventstate->x;
-		int y = win->eventstate->y;
 		
 		for (az = sa->actionzones.first; az; az = az->next)
-			if (BLI_rcti_isect_pt(&az->rect, x, y))
+			if (BLI_rcti_isect_pt_v(&az->rect, xy))
 				return 1;
 	}
 	return 0;

Modified: trunk/blender/source/blender/editors/screen/screendump.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screendump.c	2013-06-28 00:01:37 UTC (rev 57841)
+++ trunk/blender/source/blender/editors/screen/screendump.c	2013-06-28 05:39:05 UTC (rev 57842)
@@ -511,7 +511,7 @@
 	
 	ot->invoke = WM_operator_confirm;
 	ot->exec = screencast_exec;
-	ot->poll = WM_operator_winactive;
+	ot->poll = screenshot_poll;  /* shared poll */
 	
 	ot->flag = 0;