From 4905eea9e87b0ee6709dd838f1378409ea1250a3 Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Thu, 13 Jun 2013 22:36:04 -0400
Subject: Do not allow markers for children of markers (prevent loop)

Fixed bugs:
  - https://launchpad.net/bugs/261786

(bzr r12372)
---
 src/sp-shape.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/sp-shape.cpp')

diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index be9f5388c..38ffbb20c 100644
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
@@ -868,6 +868,13 @@ int SPShape::hasMarkers() const
        all three settings.  This should be fixed later such that if 'marker' is
        specified, then all three should appear. */
 
+    // Ignore markers for objects which are inside markers themselves.
+    for (SPObject *parent = this->parent; parent != NULL; parent = parent->parent) {
+      if(SP_IS_MARKER(parent)) {
+        return 0;
+      }
+    }
+
     return (
         this->_curve &&
         (this->_marker[SP_MARKER_LOC] ||
-- 
cgit v1.2.3