sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for crash with the job system progress bar on load, matt you may want to check if this case should be happening at all.

Browse Source
This commit is contained in:
Campbell Barton 2010-06-07 14:54:42 +00:00
parent ae8bba2165
commit 180a9f1a81
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/windowmanager/intern/wm_jobs.c
View File

@ -449,12 +449,15 @@ void wm_jobs_timer(const bContext *C, wmWindowManager *wm, wmTimer *wt)
} }
} }
/* if there are running jobs, set the global progress indicator */ /* on file load 'winactive' can be NULL, possibly it should not happen but for now do a NULL check - campbell */
if (jobs_progress > 0) { if(wm->winactive) {
float progress = total_progress / (float)jobs_progress; /* if there are running jobs, set the global progress indicator */
WM_progress_set(wm->winactive, progress); if (jobs_progress > 0) {
} else { float progress = total_progress / (float)jobs_progress;
WM_progress_clear(wm->winactive); WM_progress_set(wm->winactive, progress);
} else {
WM_progress_clear(wm->winactive);
}
} }
} }