summaryrefslogtreecommitdiffstats
path: root/src/attribute-sort-util.cpp
diff options
context:
space:
mode:
authorkamalpreetgrewal <grewalkamal005@gmail.com>2016-07-05 08:06:45 +0000
committerkamalpreetgrewal <grewalkamal005@gmail.com>2016-07-05 08:06:45 +0000
commite5ce55b8c222730cb5e582b4f4e4967ed1a55f8c (patch)
treecf16db9da67d4b00054e45ee85e2262a7134a8e1 /src/attribute-sort-util.cpp
parentMerge changes from trunk (diff)
parent[Bug #1574561] Italian translation updates for 0.92.x. (diff)
downloadinkscape-e5ce55b8c222730cb5e582b4f4e4967ed1a55f8c.tar.gz
inkscape-e5ce55b8c222730cb5e582b4f4e4967ed1a55f8c.zip
Merge changes from trunk
(bzr r14949.1.38)
Diffstat (limited to 'src/attribute-sort-util.cpp')
-rw-r--r--src/attribute-sort-util.cpp9
1 files changed, 7 insertions, 2 deletions
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 );
+ }
}
}