diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index edb925135b3169f97079d08a3be358a3a5199abc..c8782051bef6772088cef4d5b985488a00f16381 100644 (file)
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -344,7 +344,7 @@ sp_desktop_apply_style_tool(SPDesktop *desktop, Inkscape::XML::Node *repr, Glib:
if (prefs->getBool(tool_path + "/usecurrent") && css_current) {
sp_repr_css_set(repr, css_current, "style");
} else {
- SPCSSAttr *css = prefs->getStyle(tool_path + "/style");
+ SPCSSAttr *css = prefs->getInheritedStyle(tool_path + "/style");
sp_repr_css_set(repr, css, "style");
sp_repr_css_attr_unref(css);
}
return ret; // subselection returned a style, pass it on
// otherwise, do querying and averaging over selection
- return sp_desktop_query_style_from_list ((GSList *) desktop->selection->itemList(), style, property);
+ if (desktop->selection != NULL) {
+ return sp_desktop_query_style_from_list ((GSList *) desktop->selection->itemList(), style, property);
+ }
+
+ return QUERY_STYLE_NOTHING;
}
/**