summaryrefslogtreecommitdiffstats
path: root/src/widgets/layer-selector.cpp
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2009-02-10 07:30:56 +0000
committerjoncruz <joncruz@users.sourceforge.net>2009-02-10 07:30:56 +0000
commite903e021e4b6c7adabea47682c861dcb3326bc19 (patch)
treeef8f2d3e613f21648ca8b17631cc94bcbe002e42 /src/widgets/layer-selector.cpp
parentprevent hotkey clash (at least for english) (diff)
downloadinkscape-e903e021e4b6c7adabea47682c861dcb3326bc19.tar.gz
inkscape-e903e021e4b6c7adabea47682c861dcb3326bc19.zip
Adding explicit parenthesis to remove warnings
(bzr r7261)
Diffstat (limited to 'src/widgets/layer-selector.cpp')
-rw-r--r--src/widgets/layer-selector.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/layer-selector.cpp b/src/widgets/layer-selector.cpp
index 65f64fa4f..d51b31e67 100644
--- a/src/widgets/layer-selector.cpp
+++ b/src/widgets/layer-selector.cpp
@@ -539,7 +539,7 @@ void LayerSelector::_prepareLabelRenderer(
SPObject *layer=( _desktop ? _desktop->currentLayer() : NULL );
SPObject *root=( _desktop ? _desktop->currentRoot() : NULL );
- bool isancestor = !( layer && SP_OBJECT_PARENT(object) == SP_OBJECT_PARENT(layer) || layer == root && SP_OBJECT_PARENT(object) == root);
+ bool isancestor = !( (layer && (SP_OBJECT_PARENT(object) == SP_OBJECT_PARENT(layer))) || ((layer == root) && (SP_OBJECT_PARENT(object) == root)));
bool iscurrent = ( object == layer && object != root );