diff options
| author | Gail Carmichael <gail.banaszkiewicz@gmail.com> | 2008-01-10 22:40:48 +0000 |
|---|---|---|
| committer | gbanaszk <gbanaszk@users.sourceforge.net> | 2008-01-10 22:40:48 +0000 |
| commit | 2b56810c6a95306616f8e64499bfa20476dc7dff (patch) | |
| tree | 263eeb6eed8571cebe29fc574182ae35ca2d7e97 /src/desktop-style.cpp | |
| parent | Fix small z-order error for 3D boxes (diff) | |
| download | inkscape-2b56810c6a95306616f8e64499bfa20476dc7dff.tar.gz inkscape-2b56810c6a95306616f8e64499bfa20476dc7dff.zip | |
Fix for Bug #181663 (Font style errors / assert when changing style)
- I didn't see the problem described in the main part, but the assert was overzealous and, in my new opinion, shouldn't be there, so it's gone.
- Fixed other style button problems mentioned in comments.
(bzr r4453)
Diffstat (limited to 'src/desktop-style.cpp')
| -rw-r--r-- | src/desktop-style.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index e56e7fbbe..fe388ded3 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -1075,18 +1075,22 @@ objects_query_fontspecification (GSList *objects, SPStyle *style_res) texts ++; - if (style_res->text->font_specification.value && style->text->font_specification.value && + if (style_res->text->font_specification.value && style_res->text->font_specification.set && + style->text->font_specification.value && style->text->font_specification.set && strcmp (style_res->text->font_specification.value, style->text->font_specification.value)) { different = true; // different fonts } + + if (style->text->font_specification.set) { - if (style_res->text->font_specification.value) { - g_free(style_res->text->font_specification.value); - style_res->text->font_specification.value = NULL; + if (style_res->text->font_specification.value) { + g_free(style_res->text->font_specification.value); + style_res->text->font_specification.value = NULL; + } + + style_res->text->font_specification.set = TRUE; + style_res->text->font_specification.value = g_strdup(style->text->font_specification.value); } - - style_res->text->font_specification.set = TRUE; - style_res->text->font_specification.value = g_strdup(style->text->font_specification.value); } if (texts == 0 || !style_res->text->font_specification.set) |