diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-18 21:22:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-18 21:22:47 +0100 |
| commit | 15e737f768542fcc516296b5c158e14cc7ba7feb (patch) | |
| tree | 28c33faaaa131e2f42c6e756d21979f60953addf /src/os_mswin.c | |
| parent | 6caf606b144bbe2bf3ac515a194f5ff18fdfd331 (diff) | |
| download | vim-git-15e737f768542fcc516296b5c158e14cc7ba7feb.tar.gz | |
patch 8.0.0480: the remote_peek() test fails on MS-Windowsv8.0.0480
Problem: The remote_peek() test fails on MS-Windows.
Solution: Check for pending messages. Also report errors in the first run if
a flaky test fails twice.
Diffstat (limited to 'src/os_mswin.c')
| -rw-r--r-- | src/os_mswin.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/os_mswin.c b/src/os_mswin.c index 45b14783a..bddb08d92 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -2526,6 +2526,7 @@ serverGetReply(HWND server, int *expr_res, int remove, int wait) int i; char_u *reply; reply_T *rep; + int did_process = FALSE; /* When waiting, loop until the message waiting for is received. */ for (;;) @@ -2562,7 +2563,17 @@ serverGetReply(HWND server, int *expr_res, int remove, int wait) /* If we got here, we didn't find a reply. Return immediately if the * "wait" parameter isn't set. */ if (!wait) + { + /* Process pending messages once. Without this, looping on + * remote_peek() would never get the reply. */ + if (!did_process) + { + did_process = TRUE; + serverProcessPendingMessages(); + continue; + } break; + } /* We need to wait for a reply. Enter a message loop until the * "reply_received" flag gets set. */ |