blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Cleanup: replace 'timer_ended' with 'timer_end' 

The previous naming made it seem as if the timer had already ended
where as this function ends the timers.
This commit is contained in:
Campbell Barton 2021-03-15 14:06:38 +11:00
parent 88b24bc6bb
commit 6cd1520378
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/windowmanager/intern/wm.c
View File

@ -570,7 +570,7 @@ void wm_add_default(Main *bmain, bContext *C)
void wm_close_and_free(bContext *C, wmWindowManager *wm)
{
if (wm->autosavetimer) {
wm_autosave_timer_ended(wm);
wm_autosave_timer_end(wm);
}
#ifdef WITH_XR_OPENXR

4
source/blender/windowmanager/intern/wm_files.c
View File

@ -1645,7 +1645,7 @@ void wm_autosave_location(char *filepath)
void WM_autosave_init(wmWindowManager *wm)
{
wm_autosave_timer_ended(wm);
wm_autosave_timer_end(wm);
if (U.flag & USER_AUTOSAVE) {
wm->autosavetimer = WM_event_add_timer(wm, NULL, TIMERAUTOSAVE, U.savetime * 60.0);
@ -1694,7 +1694,7 @@ void wm_autosave_timer(Main *bmain, wmWindowManager *wm, wmTimer *UNUSED(wt))
wm->autosavetimer = WM_event_add_timer(wm, NULL, TIMERAUTOSAVE, U.savetime * 60.0);
}
void wm_autosave_timer_ended(wmWindowManager *wm)
void wm_autosave_timer_end(wmWindowManager *wm)
{
if (wm->autosavetimer) {
WM_event_remove_timer(wm, NULL, wm->autosavetimer);

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

@ -605,7 +605,7 @@ void WM_jobs_kill(wmWindowManager *wm,
}
/* kill job entirely, also removes timer itself */
void wm_jobs_timer_ended(wmWindowManager *wm, wmTimer *wt)
void wm_jobs_timer_end(wmWindowManager *wm, wmTimer *wt)
{
LISTBASE_FOREACH (wmJob *, wm_job, &wm->jobs) {
if (wm_job->wt == wt) {

2
source/blender/windowmanager/intern/wm_window.c
View File

@ -216,7 +216,7 @@ void wm_window_free(bContext *C, wmWindowManager *wm, wmWindow *win)
/* end running jobs, a job end also removes its timer */
LISTBASE_FOREACH_MUTABLE (wmTimer *, wt, &wm->timers) {
if (wt->win == win && wt->event_type == TIMERJOBS) {
wm_jobs_timer_ended(wm, wt);
wm_jobs_timer_end(wm, wt);
}
}

4
source/blender/windowmanager/wm.h
View File

@ -71,11 +71,11 @@ void wm_tweakevent_test(bContext *C, const wmEvent *event, int action);
/* wm_jobs.c */
void wm_jobs_timer(wmWindowManager *wm, wmTimer *wt);
void wm_jobs_timer_ended(wmWindowManager *wm, wmTimer *wt);
void wm_jobs_timer_end(wmWindowManager *wm, wmTimer *wt);
/* wm_files.c */
void wm_autosave_timer(struct Main *bmain, wmWindowManager *wm, wmTimer *wt);
void wm_autosave_timer_ended(wmWindowManager *wm);
void wm_autosave_timer_end(wmWindowManager *wm);
void wm_autosave_delete(void);
void wm_autosave_read(bContext *C, struct ReportList *reports);
void wm_autosave_location(char *filepath);