[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33430] trunk/blender/source/blender/ editors/space_info/info_ops.c: fix crash when report timer was set but no usable error reports were found .
Campbell Barton
ideasman42 at gmail.com
Thu Dec 2 22:40:39 CET 2010
Revision: 33430
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33430
Author: campbellbarton
Date: 2010-12-02 22:40:39 +0100 (Thu, 02 Dec 2010)
Log Message:
-----------
fix crash when report timer was set but no usable error reports were found.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_info/info_ops.c
Modified: trunk/blender/source/blender/editors/space_info/info_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/info_ops.c 2010-12-02 19:03:24 UTC (rev 33429)
+++ trunk/blender/source/blender/editors/space_info/info_ops.c 2010-12-02 21:40:39 UTC (rev 33430)
@@ -326,10 +326,13 @@
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;
More information about the Bf-blender-cvs
mailing list