summaryrefslogtreecommitdiffstats
path: root/src/style.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-10-04 18:16:29 +0000
committerjabiertxof <jabier.arraiza@marker.es>2015-10-04 18:16:29 +0000
commitbd5317c58e55c608148f1cc62b813fea7077c76a (patch)
treeba739ddc4c3c6c2e8860b2ea9308307efcdad158 /src/style.cpp
parentAdded knots to post editing the measure and make it persistant throught tools (diff)
parentFixes clonetiler trace mode on non-px documents (diff)
downloadinkscape-bd5317c58e55c608148f1cc62b813fea7077c76a.tar.gz
inkscape-bd5317c58e55c608148f1cc62b813fea7077c76a.zip
update to trunk
(bzr r14393.1.4)
Diffstat (limited to 'src/style.cpp')
-rw-r--r--src/style.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/style.cpp b/src/style.cpp
index d8402e08a..0cb5db0a7 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -1258,7 +1258,7 @@ SPStyle::getFontFeatureString() {
if( font_variant_east_asian.value & SP_CSS_FONT_VARIANT_EAST_ASIAN_RUBY )
feature_string += "ruby, ";
- if ( strcmp( font_feature_settings.value, "normal") ) {
+ if ( font_feature_settings.value && strcmp( font_feature_settings.value, "normal") ) {
// We do no sanity checking...
feature_string += font_feature_settings.value;
feature_string += ", ";