summaryrefslogtreecommitdiffstats
path: root/src/sp-object.cpp
diff options
context:
space:
mode:
authorbulia byak <buliabyak@gmail.com>2007-02-11 02:00:45 +0000
committerbuliabyak <buliabyak@users.sourceforge.net>2007-02-11 02:00:45 +0000
commit0b7d34a75df1bb5504edd0e81e4dd7558f89e5d7 (patch)
tree000e1af989f49f9d24b72f33aa52b2fa9125e91a /src/sp-object.cpp
parentadded comments. updated version (diff)
downloadinkscape-0b7d34a75df1bb5504edd0e81e4dd7558f89e5d7.tar.gz
inkscape-0b7d34a75df1bb5504edd0e81e4dd7558f89e5d7.zip
fix 1654495: a comment repr node has no spobject, so we must weaken the asserts
(bzr r2355)
Diffstat (limited to 'src/sp-object.cpp')
-rw-r--r--src/sp-object.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index 9294a2e9f..9b6c24917 100644
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -737,8 +737,9 @@ sp_object_remove_child(SPObject *object, Inkscape::XML::Node *child)
{
debug("id=%x, typename=%s", object, g_type_name_from_instance((GTypeInstance*)object));
SPObject *ochild = sp_object_get_child_by_repr(object, child);
- g_return_if_fail(ochild != NULL);
- sp_object_detach(object, ochild);
+ g_return_if_fail (ochild != NULL || !strcmp("comment", child->name())); // comments have no objects
+ if (ochild)
+ sp_object_detach(object, ochild);
}
/**