patch 8.0.1296: checking the same condition twice

Problem:    Checking the same condition twice. (John Marriott)
Solution:   Check blinkwait.

diff --git a/src/gui.c b/src/gui.c
index e6cc544dce6147be0b7ffa8218a66fbbc322eba3..7ef1c95341d60f3141e428c4d9407d9b72c2b9a8 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -1118,7 +1118,8 @@ gui_update_cursor(
        gui_mch_set_blinking(shape->blinkwait,
                             shape->blinkon,
                             shape->blinkoff);
-       if (shape->blinkoff == 0 || shape->blinkon == 0 || shape->blinkoff == 0)
+       if (shape->blinkwait == 0 || shape->blinkon == 0
+                                                      || shape->blinkoff == 0)
            gui_mch_stop_blink();
 #ifdef FEAT_TERMINAL
        if (shape_bg != INVALCOLOR)

diff --git a/src/version.c b/src/version.c
index 2c190a6b3c23ec84e85c77bc9c94b3342e9af996..6590bf60c5758632da3eec9d56ec4f9801bef25b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1296,
 /**/
     1295,
 /**/