riched20: Don't compare the colours if the old and new states are both auto.

Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

riched20: Don't compare the colours if the old and new states are both auto.
5f3772a7 · Huw Davies · Alexandre Julliard · 71cc41b9 · 5f3772a7
Commit 5f3772a7 authored Apr 05, 2017 by Huw Davies Committed by Alexandre Julliard Apr 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

writer.c dlls/riched20/writer.c +2 -2

No files found.
--- a/dlls/riched20/writer.c
+++ b/dlls/riched20/writer.c
@@ -769,14 +769,14 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt)
  }

  if ((old_fmt->dwEffects ^ fmt->dwEffects) & CFE_AUTOBACKCOLOR ||
-      old_fmt->crBackColor != fmt->crBackColor)
+      (!(fmt->dwEffects & CFE_AUTOBACKCOLOR) && old_fmt->crBackColor != fmt->crBackColor))
  {
      if (fmt->dwEffects & CFE_AUTOBACKCOLOR) i = 0;
      else find_color_in_colortbl( pStream, fmt->crBackColor, &i );
      sprintf(props + strlen(props), "\\cb%u", i);
  }
  if ((old_fmt->dwEffects ^ fmt->dwEffects) & CFE_AUTOCOLOR ||
-      old_fmt->crTextColor != fmt->crTextColor)
+      (!(fmt->dwEffects & CFE_AUTOCOLOR) && old_fmt->crTextColor != fmt->crTextColor))
  {
      if (fmt->dwEffects & CFE_AUTOCOLOR) i = 0;
      else find_color_in_colortbl( pStream, fmt->crTextColor, &i );