avoid crashes running screendump and screen editing operators in background mode. (not that these would be useful but better not crash)

2 files changed, 4 insertions, 5 deletions

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index f4172d4ec80..c70841ffe82 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -599,13 +599,12 @@ static int actionzone_area_poll(bContext *C)
 	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;
diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c
index b16721640da..584d4cef133 100644
--- a/source/blender/editors/screen/screendump.c
+++ b/source/blender/editors/screen/screendump.c
@@ -511,7 +511,7 @@ void SCREEN_OT_screencast(wmOperatorType *ot)
 	
 	ot->invoke = WM_operator_confirm;
 	ot->exec = screencast_exec;
-	ot->poll = WM_operator_winactive;
+	ot->poll = screenshot_poll;  /* shared poll */
 	
 	ot->flag = 0;