diff options
Diffstat (limited to 'source/blender/editors/space_info/info_ops.c')
| -rw-r--r-- | source/blender/editors/space_info/info_ops.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index 7eb7cc55bc1..6ffbf1455e4 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -326,10 +326,13 @@ static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), wm int send_note= 0; /* escape if not our timer */ - if(reports->reporttimer==NULL || reports->reporttimer != event->customdata) + if( (reports->reporttimer==NULL) || + (reports->reporttimer != event->customdata) || + ((report= BKE_reports_last_displayable(reports))==NULL) /* may have been deleted */ + ) { return OPERATOR_PASS_THROUGH; + } - report= BKE_reports_last_displayable(reports); rti = (ReportTimerInfo *)reports->reporttimer->customdata; timeout = (report->type & RPT_ERROR_ALL)?ERROR_TIMEOUT:INFO_TIMEOUT; |