From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 5 Mar 2016 21:19:41 +0000 (+0100)
Subject: patch 7.4.1496
X-Git-Tag: v7.4.1496
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a96909cfaf21dbbf033e904ccdcda9905799f0fc;p=vim

patch 7.4.1496
Problem:    Crash when built with GUI but it's not active. (Dominique Pelle)
Solution:   Check gui.in_use.
---

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
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1496,
 /**/
     1495,
 /**/