another currentColor fix from bug 174720

diff --git a/src/style.cpp b/src/style.cpp
index 46ff51e18bab16b2cf8f12616625e304949f5c2b..97781737ec7cf56f97c67d139339544c38071c8c 100644 (file)
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -3646,7 +3646,7 @@ sp_style_write_ipaint(gchar *b, gint const len, gchar const *const key,
                 css << "currentColor";
             }
 
-            if ( paint->colorSet ) {
+            if ( paint->colorSet && !paint->currentcolor ) {
                 if ( !css.str().empty() ) {
                     css << " ";
                 }
@@ -3655,7 +3655,7 @@ sp_style_write_ipaint(gchar *b, gint const len, gchar const *const key,
                 css << color_buf;
             }
 
-            if (paint->value.color.icc) {
+            if (paint->value.color.icc && !paint->currentcolor) {
                 if ( !css.str().empty() ) {
                     css << " ";
                 }