diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-16 21:58:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-16 21:58:13 +0200 |
| commit | 69198cb8c08f124729c41a4681f2d142228a9139 (patch) | |
| tree | 12b2ba27e1239074e4bcb1f6f6524d23ab996158 /src/channel.c | |
| parent | dac1347b4d9c1a1aef6aa73fdea08a9d1077d6ea (diff) | |
| download | vim-git-69198cb8c08f124729c41a4681f2d142228a9139.tar.gz | |
patch 8.1.2046: SafeState may be triggered at the wrong momentv8.1.2046
Problem: SafeState may be triggered at the wrong moment.
Solution: Move it up higher to after where messages are processed. Add a
SafeStateAgain event to tigger there.
Diffstat (limited to 'src/channel.c')
| -rw-r--r-- | src/channel.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/channel.c b/src/channel.c index 3792b354b..0dab3be5f 100644 --- a/src/channel.c +++ b/src/channel.c @@ -3593,10 +3593,6 @@ channel_read_json_block( ch_log(channel, "Blocking read JSON for id %d", id); - // Not considered a safe state here, since we are processing a JSON message - // and parsing other messages while waiting. - enter_unsafe_state(); - if (id >= 0) channel_add_block_id(chanpart, id); @@ -3666,9 +3662,6 @@ channel_read_json_block( if (id >= 0) channel_remove_block_id(chanpart, id); - // This may trigger a SafeState autocommand. - leave_unsafe_state(); - return retval; } |