Re: [PATCH 1/6] wineconsole: Add if check to determine whether a font attribute has changed

[Sebastian Lackner]

On 28.10.2015 09:40, Hugh McMaster wrote:
> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com>
> ---
>  programs/wineconsole/wineconsole.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
> index e1ee55b..c8e68c1 100644
> --- a/programs/wineconsole/wineconsole.c
> +++ b/programs/wineconsole/wineconsole.c
> @@ -421,7 +421,8 @@ void     WINECON_SetConfig(struct inner_data* data, const struct config_data* cf
>      }
>      data->curcfg.menu_mask = cfg->menu_mask;
>      data->curcfg.quick_edit = cfg->quick_edit;
> -    if (1 /* FIXME: font info has changed */)
> +    if (data->curcfg.face_name != cfg->face_name || data->curcfg.cell_width != cfg->cell_width ||
> +        data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_weight != cfg->font_weight)
>      {
>          data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight);
>      }

It doesn't make sense to compare face_name pointer, this condition will always be true.

[PATCH 1/6] wineconsole: Add if check to determine whether a font attribute has changed

[Hugh McMaster]

On Thursday, 29 Oct 2015 05:18:16 +0100, Sebastian Lackner wrote:
> On 28.10.2015 09:40, Hugh McMaster wrote:
> > Signed-off-by: Hugh McMaster 
> > ---
> >  programs/wineconsole/wineconsole.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
> > index e1ee55b..c8e68c1 100644
> > --- a/programs/wineconsole/wineconsole.c
> > +++ b/programs/wineconsole/wineconsole.c
> > @@ -421,7 +421,8 @@ void     WINECON_SetConfig(struct inner_data* data, const struct config_data* cf
> >      }
> >      data->curcfg.menu_mask = cfg->menu_mask;
> >      data->curcfg.quick_edit = cfg->quick_edit;
> > -    if (1 /* FIXME: font info has changed */)
> > +    if (data->curcfg.face_name != cfg->face_name || data->curcfg.cell_width != cfg->cell_width ||
> > +        data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_weight != cfg->font_weight)
> >      {
> >          data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight);
> >      }
>
> It doesn't make sense to compare face_name pointer, this condition will always be true.

Thanks for the pick-up. I can't believe I did that.

I'll send a revised patch comparing the strings later today.