prefs: fix bug in color saving

Colors were only saved and effectuated when all 3 color components are changed.

Change-Id: I0d82ac8d62780e507714bc48c310338e87deefea
Reviewed-on: https://code.wireshark.org/review/27639
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

diff --git a/epan/prefs.c b/epan/prefs.c
index acf34f9dea0f1642c106d47cea0c93efd385a0b8..76c316ce2d86664fe9a137bc39617d6e5e5af40c 100644 (file)
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -1717,24 +1717,24 @@ gboolean prefs_set_color_value(pref_t *pref, color_t value, pref_source_t source
     switch (source)
     {
     case pref_default:
-        if ((pref->default_val.color.red != value.red) &&
-            (pref->default_val.color.green != value.green) &&
+        if ((pref->default_val.color.red != value.red) ||
+            (pref->default_val.color.green != value.green) ||
             (pref->default_val.color.blue != value.blue)) {
             changed = TRUE;
             pref->default_val.color = value;
         }
         break;
     case pref_stashed:
-        if ((pref->stashed_val.color.red != value.red) &&
-            (pref->stashed_val.color.green != value.green) &&
+        if ((pref->stashed_val.color.red != value.red) ||
+            (pref->stashed_val.color.green != value.green) ||
             (pref->stashed_val.color.blue != value.blue)) {
             changed = TRUE;
             pref->stashed_val.color = value;
         }
         break;
     case pref_current:
-        if ((pref->varp.colorp->red != value.red) &&
-            (pref->varp.colorp->green != value.green) &&
+        if ((pref->varp.colorp->red != value.red) ||
+            (pref->varp.colorp->green != value.green) ||
             (pref->varp.colorp->blue != value.blue)) {
             changed = TRUE;
             *pref->varp.colorp = value;