diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval/typval.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c index 726619eb43..fe3d147040 100644 --- a/src/nvim/eval/typval.c +++ b/src/nvim/eval/typval.c @@ -1267,6 +1267,7 @@ void tv_dict_watcher_notify(dict_T *const dict, const char *const key, typval_T rettv; + bool any_needs_free = false; dict->dv_refcount++; QUEUE *w; QUEUE_FOREACH(w, &dict->watchers, { @@ -1277,15 +1278,20 @@ void tv_dict_watcher_notify(dict_T *const dict, const char *const key, callback_call(&watcher->callback, 3, argv, &rettv); watcher->busy = false; tv_clear(&rettv); + if (watcher->needs_free) { + any_needs_free = true; + } } }) - QUEUE_FOREACH(w, &dict->watchers, { - DictWatcher *watcher = tv_dict_watcher_node_data(w); - if (watcher->needs_free) { - QUEUE_REMOVE(w); - tv_dict_watcher_free(watcher); - } - }) + if (any_needs_free) { + QUEUE_FOREACH(w, &dict->watchers, { + DictWatcher *watcher = tv_dict_watcher_node_data(w); + if (watcher->needs_free) { + QUEUE_REMOVE(w); + tv_dict_watcher_free(watcher); + } + }) + } tv_dict_unref(dict); for (size_t i = 1; i < ARRAY_SIZE(argv); i++) { |