summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/layers.cpp
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2013-06-28 04:45:10 +0000
committerMartin Owens <doctormo@gmail.com>2013-06-28 04:45:10 +0000
commit6ba58cf2eb05a8e44f21f853dc638a41b6cc59b2 (patch)
tree6b62d4dd3d9e0bfe3ba5a9e496f4fb832c867671 /src/ui/dialog/layers.cpp
parentAdd the ability to reorder filters using drag-drop in the gtklist (diff)
downloadinkscape-6ba58cf2eb05a8e44f21f853dc638a41b6cc59b2.tar.gz
inkscape-6ba58cf2eb05a8e44f21f853dc638a41b6cc59b2.zip
Fix crash when undoing/redoing a duplicate layer.
Fixed bugs: - https://launchpad.net/bugs/1183206 (bzr r12395)
Diffstat (limited to 'src/ui/dialog/layers.cpp')
-rw-r--r--src/ui/dialog/layers.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 5cc9578f1..ce923f6b4 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -404,13 +404,13 @@ void LayersPanel::_addLayer( SPDocument* doc, SPObject* layer, Gtk::TreeModel::R
SPObject *child = _desktop->layer_manager->nthChildOf(layer, i);
if ( child ) {
#if DUMP_LAYERS
- g_message(" %3d layer:%p {%s} [%s]", level, child, child->id, child->label() );
+ g_message(" %3d layer:%p {%s} [%s]", level, child, child->getId(), child->label() );
#endif // DUMP_LAYERS
Gtk::TreeModel::iterator iter = parentRow ? _store->prepend(parentRow->children()) : _store->prepend();
Gtk::TreeModel::Row row = *iter;
row[_model->_colObject] = child;
- row[_model->_colLabel] = child->label() ? child->label() : child->getId();
+ row[_model->_colLabel] = child->defaultLabel();
row[_model->_colVisible] = SP_IS_ITEM(child) ? !SP_ITEM(child)->isHidden() : false;
row[_model->_colLocked] = SP_IS_ITEM(child) ? SP_ITEM(child)->isLocked() : false;