From 5cd0fcd53cf3734cd5e0a52454ce0443fa6754ad Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Sun, 16 Jun 2013 09:48:12 -0400
Subject: Fix layer selection so defs don't change layers, updated symbol text.

(bzr r12379)
---
 src/desktop.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/desktop.cpp')

diff --git a/src/desktop.cpp b/src/desktop.cpp
index 0bf442b7a..17548ee56 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -70,6 +70,7 @@
 #include "sp-item-group.h"
 #include "sp-namedview.h"
 #include "sp-root.h"
+#include "sp-defs.h"
 #include "widgets/desktop-widget.h"
 #include "xml/repr.h"
 #include "helper/action.h" //sp_action_perform
@@ -595,6 +596,9 @@ SPObject *SPDesktop::layerForObject(SPObject *object) {
     SPObject *root=currentRoot();
     object = object->parent;
     while ( object && object != root && !isLayer(object) ) {
+        // Objects in defs have no layer and are NOT in the root layer
+        if(SP_IS_DEFS(object))
+            return NULL;
         object = object->parent;
     }
     return object;
-- 
cgit v1.2.3