[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23371] trunk/blender/source/blender/ editors/space_file/file_ops.c: 2.5 filebrowser

[Andrea Weikert]

Revision: 23371
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23371
Author:   elubie
Date:     2009-09-20 19:23:57 +0200 (Sun, 20 Sep 2009)

Log Message:
-----------
2.5 filebrowser
* fix crash when filebrowser tried to invoke the file_exec or file_cancel in cases no operator was set.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/file_ops.c

Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_ops.c	2009-09-20 16:49:05 UTC (rev 23370)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c	2009-09-20 17:23:57 UTC (rev 23371)
@@ -526,6 +526,16 @@
 	return OPERATOR_FINISHED;
 }
 
+int file_operator_poll(bContext *C)
+{
+	int poll = ED_operator_file_active(C);
+	SpaceFile *sfile= CTX_wm_space_file(C);
+
+	if (!sfile->op) poll= 0;
+
+	return poll;
+}
+
 void FILE_OT_cancel(struct wmOperatorType *ot)
 {
 	/* identifiers */
@@ -534,7 +544,7 @@
 	
 	/* api callbacks */
 	ot->exec= file_cancel_exec;
-	ot->poll= ED_operator_file_active;
+	ot->poll= file_operator_poll;
 }
 
 /* sends events now, so things get handled on windowqueue level */
@@ -612,7 +622,7 @@
 	
 	/* api callbacks */
 	ot->exec= file_exec;
-	ot->poll= ED_operator_file_active; /* <- important, handler is on window level */
+	ot->poll= file_operator_poll; 
 }