summaryrefslogtreecommitdiffstats
path: root/src/desktop.cpp
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2006-05-29 16:12:36 +0000
committerjoncruz <joncruz@users.sourceforge.net>2006-05-29 16:12:36 +0000
commitd04860c5b4725baed4db6f992f5728407cc72d87 (patch)
treeafc0011377e40c03903e596fbc36360ec2aff556 /src/desktop.cpp
parentdefault inkboard to off for the remainder of the freeze (diff)
downloadinkscape-d04860c5b4725baed4db6f992f5728407cc72d87.tar.gz
inkscape-d04860c5b4725baed4db6f992f5728407cc72d87.zip
workaround assertion upon file revert
(bzr r1064)
Diffstat (limited to 'src/desktop.cpp')
-rw-r--r--src/desktop.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp
index b1dbae118..17ce0907c 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -380,7 +380,7 @@ SPObject *SPDesktop::currentLayer() const
*/
void SPDesktop::setCurrentLayer(SPObject *object) {
g_return_if_fail(SP_IS_GROUP(object));
- g_return_if_fail( currentRoot() == object || currentRoot()->isAncestorOf(object));
+ g_return_if_fail( currentRoot() == object || (currentRoot() && currentRoot()->isAncestorOf(object)) );
// printf("Set Layer to ID: %s\n", SP_OBJECT_ID(object));
_layer_hierarchy->setBottom(object);
}