archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5 filebrowser

Browse Source 
* fix crash when filebrowser tried to invoke the file_exec or file_cancel in cases no operator was set.
This commit is contained in:
Andrea Weikert
2009-09-20 17:23:57 +00:00
parent 4b6c61e0a7
commit e4a50e3f47
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/space_file/file_ops.c
View File

@@ -526,6 +526,16 @@ int file_cancel_exec(bContext *C, wmOperator *unused)
return OPERATOR_FINISHED; 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) void FILE_OT_cancel(struct wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
@@ -534,7 +544,7 @@ void FILE_OT_cancel(struct wmOperatorType *ot)
/* api callbacks */ /* api callbacks */
ot->exec= file_cancel_exec; 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 */ /* sends events now, so things get handled on windowqueue level */
@@ -612,7 +622,7 @@ void FILE_OT_execute(struct wmOperatorType *ot)
/* api callbacks */ /* api callbacks */
ot->exec= file_exec; ot->exec= file_exec;
ot->poll= ED_operator_file_active; /* <- important, handler is on window level */ ot->poll= file_operator_poll;
} }