[gnumeric] Style: fix t6050 and t6515 failure.

[Morten Welinder <mortenw src gnome org>]

commit c8dd97348e79b5d90ab8ebe7575288f366d7cf54
Author: Morten Welinder <terra gnome org>
Date:   Wed Jan 25 20:58:41 2017 -0500

    Style: fix t6050 and t6515 failure.

 ChangeLog    |    4 ++++
 src/mstyle.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 19b2291..0237da3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-25  Morten Welinder  <terra gnome org>
+
+       * src/mstyle.c (ELEM_IS_EQ): Fix last fix.
+
 2017-01-22  Morten Welinder  <terra gnome org>
 
        * src/stf-parse.c (stf_cell_set_text): Don't parse "=..." as
diff --git a/src/mstyle.c b/src/mstyle.c
index 7a8a120..67e8525 100644
--- a/src/mstyle.c
+++ b/src/mstyle.c
@@ -394,7 +394,7 @@ gnm_style_hash (gconstpointer style)
     ? a->input_msg == b->input_msg                                     \
     : (elem == MSTYLE_CONDITIONS                                       \
     ? (a->conditions == b->conditions ||                               \
-       (a->conditions &&                                               \
+       (a->conditions && b->conditions &&                              \
        gnm_style_conditions_equal (a->conditions, b->conditions)))     \
     : FALSE)))))))))))))))))))))))))