From f5c74e3a9d4e23e6cc86851b426dd05958e907ee Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Mon, 4 Jul 2016 14:30:44 +0200
Subject: Prevent data-losing crash when sorting attributes and Layer dialog
 open.

(bzr r15007)
---
 src/attribute-sort-util.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/attribute-sort-util.cpp')

diff --git a/src/attribute-sort-util.cpp b/src/attribute-sort-util.cpp
index d0f45c418..5c01f7914 100644
--- a/src/attribute-sort-util.cpp
+++ b/src/attribute-sort-util.cpp
@@ -105,12 +105,17 @@ void sp_attribute_sort_element(Node *repr) {
   //for (auto it: my_list) {
   for (std::vector<std::pair< Glib::ustring, Glib::ustring > >::iterator it = my_list.begin();
                               it != my_list.end(); ++it) {
-       repr->setAttribute( it->first.c_str(), NULL, false );
+      // Removing "inkscape:label" results in crash when Layers dialog is open.
+      if (it->first != "inkscape:label") {
+          repr->setAttribute( it->first.c_str(), NULL, false );
+      }
   }
   // Insert all attributes in proper order
   for (std::vector<std::pair< Glib::ustring, Glib::ustring > >::iterator it = my_list.begin();
                               it != my_list.end(); ++it) {
-      repr->setAttribute( it->first.c_str(), it->second.c_str(), false );
+      if (it->first != "inkscape:label") {
+          repr->setAttribute( it->first.c_str(), it->second.c_str(), false );
+      }
   } 
 }
 
-- 
cgit v1.2.3