summaryrefslogtreecommitdiffstats
path: root/src/sp-guide.cpp
diff options
context:
space:
mode:
authorGeoff Lankow <geoff@darktrojan.net>2015-07-11 02:25:47 +0000
committerGeoff Lankow <geoff@darktrojan.net>2015-07-11 02:25:47 +0000
commitc708f6f8ef412736862def24411cb1e7a86e6b27 (patch)
tree40134b921518d50eb7839a8c823991011fcf4c65 /src/sp-guide.cpp
parentRead inkscape:color attribute on guides (diff)
downloadinkscape-c708f6f8ef412736862def24411cb1e7a86e6b27.tar.gz
inkscape-c708f6f8ef412736862def24411cb1e7a86e6b27.zip
Read attribute after setting the default
(bzr r14228.1.2)
Diffstat (limited to 'src/sp-guide.cpp')
-rw-r--r--src/sp-guide.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 83e723e5c..b4f4cecc0 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -71,7 +71,6 @@ void SPGuide::build(SPDocument *document, Inkscape::XML::Node *repr)
{
SPObject::build(document, repr);
- this->readAttr( "inkscape:color" );
this->readAttr( "inkscape:label" );
this->readAttr( "orientation" );
this->readAttr( "position" );
@@ -98,7 +97,9 @@ void SPGuide::release()
void SPGuide::set(unsigned int key, const gchar *value) {
switch (key) {
case SP_ATTR_INKSCAPE_COLOR:
- this->setColor(sp_svg_read_color(value, 0x0000ff00) | 0x7f);
+ if (value) {
+ this->setColor(sp_svg_read_color(value, 0x0000ff00) | 0x7f);
+ }
break;
case SP_ATTR_INKSCAPE_LABEL:
if (this->label) g_free(this->label);