diff options
| author | Ted Gould <ted@gould.cx> | 2009-11-29 19:01:07 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-11-29 19:01:07 +0000 |
| commit | 29d3c0b15028e61f176df3a75189bf0959d0d03e (patch) | |
| tree | 727afe596c693a9bdd098d72618abd9ceb0d1969 /src/text-editing.cpp | |
| parent | Add the build dir dbus directory to grab some headerfiles for distcheck. (diff) | |
| parent | hopefully fix build on linux (diff) | |
| download | inkscape-29d3c0b15028e61f176df3a75189bf0959d0d03e.tar.gz inkscape-29d3c0b15028e61f176df3a75189bf0959d0d03e.zip | |
Merging in from trunk
(bzr r8254.1.37)
Diffstat (limited to 'src/text-editing.cpp')
| -rw-r--r-- | src/text-editing.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/text-editing.cpp b/src/text-editing.cpp index 5b9db13d4..2bdee4c10 100644 --- a/src/text-editing.cpp +++ b/src/text-editing.cpp @@ -1547,8 +1547,9 @@ static bool redundant_double_nesting_processor(SPObject **item, SPObject *child, if (!objects_have_equal_style(SP_OBJECT_PARENT(*item), child)) return false; Inkscape::XML::Node *insert_after_repr; - if (prepend) insert_after_repr = SP_OBJECT_REPR(SP_OBJECT_PREV(*item)); - else insert_after_repr = SP_OBJECT_REPR(*item); + if (!prepend) insert_after_repr = SP_OBJECT_REPR(*item); + else if (SP_OBJECT_PREV(*item)) insert_after_repr = SP_OBJECT_REPR(SP_OBJECT_PREV(*item)); + else insert_after_repr = NULL; while (SP_OBJECT_REPR(child)->childCount()) { Inkscape::XML::Node *move_repr = SP_OBJECT_REPR(child)->firstChild(); Inkscape::GC::anchor(move_repr); |