From 5c1bf694245bd8a87f140483927e9e8771b0d42b Mon Sep 17 00:00:00 2001 From: tweenk Date: Fri, 13 Feb 2009 22:22:06 +0000 Subject: [PATCH] Fix crashes when tool styles are not set in prefs. --- src/preferences.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/preferences.h b/src/preferences.h index 0c37be24b..e1b3136a8 100644 --- a/src/preferences.h +++ b/src/preferences.h @@ -163,7 +163,7 @@ public: inline Glib::ustring getString() const; /** * @brief Interpret the preference as a CSS style. - * @return A CSS style that has to be unrefed when no longer necessary. + * @return A CSS style that has to be unrefed when no longer necessary. Never NULL. */ inline SPCSSAttr *getStyle() const; /** @@ -173,7 +173,7 @@ public: * This function will look up the preferences with the same entry name * in ancestor directories and return the inherited CSS style. * - * @return Inherited CSS style that has to be unrefed after use. + * @return Inherited CSS style that has to be unrefed after use. Never NULL. */ inline SPCSSAttr *getInheritedStyle() const; @@ -511,13 +511,13 @@ inline Glib::ustring Preferences::Entry::getString() const inline SPCSSAttr *Preferences::Entry::getStyle() const { - if (!this->isValid()) return NULL; + if (!this->isValid()) return sp_repr_css_attr_new(); return Inkscape::Preferences::get()->_extractStyle(*this); } inline SPCSSAttr *Preferences::Entry::getInheritedStyle() const { - if (!this->isValid()) return NULL; + if (!this->isValid()) return sp_repr_css_attr_new(); return Inkscape::Preferences::get()->_extractInheritedStyle(*this); } -- 2.30.2