From: buliabyak <buliabyak@users.sourceforge.net>
Date: Tue, 8 Apr 2008 18:42:56 +0000 (+0000)
Subject: another currentColor fix from bug 174720
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cb60570832925b29c8cc9f7bdd8f4774ed077cd3;p=inkscape.git

another currentColor fix from bug 174720
---

diff --git a/src/style.cpp b/src/style.cpp
index 46ff51e18..97781737e 100644
--- 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 << " ";
                 }