diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2016-05-25 13:56:55 +0200 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2016-05-25 13:56:55 +0200 |
| commit | 2115fcdfd5a6b32b62dcd280c59843437c4702d6 (patch) | |
| tree | 4f8070773dd7548320d82ff943c1387348c50bc1 /src | |
| parent | c74ce334f2f7c42dcd33bc5a0d1cc02b752733f6 (diff) | |
| parent | 251963879650569a83206f20dc7f07e63a40b3f4 (diff) | |
| download | rneovim-2115fcdfd5a6b32b62dcd280c59843437c4702d6.tar.gz rneovim-2115fcdfd5a6b32b62dcd280c59843437c4702d6.tar.bz2 rneovim-2115fcdfd5a6b32b62dcd280c59843437c4702d6.zip | |
Merge pull request #4815 from bfredl/timerfix
timers: racy case found on travis
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 6ae5081550..0d060e5b70 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -16529,6 +16529,9 @@ static void f_timer_stop(typval_T *argvars, typval_T *rettv) static void timer_due_cb(TimeWatcher *tw, void *data) { timer_T *timer = (timer_T *)data; + if (timer->stopped) { + return; + } // if repeat was negative repeat forever if (timer->repeat_count >= 0 && --timer->repeat_count == 0) { timer_stop(timer); |