diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-05 22:19:41 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-05 22:19:41 +0100 |
| commit | a96909cfaf21dbbf033e904ccdcda9905799f0fc (patch) | |
| tree | c8a449d1916bf3e8c6e05d3c2ab9b5758e74e946 | |
| parent | 802d559431e6003a46c7f19628213b7cec8ba6d0 (diff) | |
| download | vim-git-a96909cfaf21dbbf033e904ccdcda9905799f0fc.tar.gz | |
patch 7.4.1496v7.4.1496
Problem: Crash when built with GUI but it's not active. (Dominique Pelle)
Solution: Check gui.in_use.
| -rw-r--r-- | src/channel.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/channel.c b/src/channel.c index da13f962c..6ede9160d 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1046,8 +1046,11 @@ invoke_callback(channel_T *channel, char_u *callback, typval_T *argv) cursor_on(); out_flush(); #ifdef FEAT_GUI - gui_update_cursor(TRUE, FALSE); - gui_mch_flush(); + if (gui.in_use) + { + gui_update_cursor(TRUE, FALSE); + gui_mch_flush(); + } #endif } diff --git a/src/version.c b/src/version.c index 437e5f6cf..fa036f614 100644 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1496, +/**/ 1495, /**/ 1494, |