Skip to content

Commit 3767c6e

Browse files
committed
patch 8.0.1373: no error when settting 'renderoptions' before starting GUI
Problem: No error when settting 'renderoptions' to an invalid value before starting the GUI. Solution: Always check the value. (Ken Takata, closes #2413)
1 parent ac112f0 commit 3767c6e

3 files changed

Lines changed: 6 additions & 1 deletion

File tree

src/gui_w32.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ gui_mch_set_rendering_options(char_u *s)
127127
return FAIL;
128128
}
129129

130+
if (!gui.in_use)
131+
return OK; /* only checking the syntax of the value */
132+
130133
/* Enable DirectX/DirectWrite */
131134
if (dx_enable)
132135
{

src/option.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7406,7 +7406,7 @@ did_set_string_option(
74067406

74077407
#if defined(FEAT_RENDER_OPTIONS)
74087408
/* 'renderoptions' */
7409-
else if (varp == &p_rop && gui.in_use)
7409+
else if (varp == &p_rop)
74107410
{
74117411
if (!gui_mch_set_rendering_options(p_rop))
74127412
errmsg = e_invarg;

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,8 @@ static char *(features[]) =
771771

772772
static int included_patches[] =
773773
{ /* Add new patch number below this line */
774+
/**/
775+
1373,
774776
/**/
775777
1372,
776778
/**/

0 commit comments

Comments
 (0)