diff options
| author | Nathan Lee <2431820-nathanal@users.noreply.gitlab.com> | 2019-11-05 22:37:05 +0000 |
|---|---|---|
| committer | Nathan Lee <2431820-nathanal@users.noreply.gitlab.com> | 2019-11-10 23:12:10 +0000 |
| commit | 5b22a003be75c72b07ae9ed90496be9f5bee4992 (patch) | |
| tree | f1e3367055f1aea84e0996cef7bbbd6ae981ecda /src/ui/dialog/layers.cpp | |
| parent | Updated es.po with a few new strings from the source code (diff) | |
| download | inkscape-5b22a003be75c72b07ae9ed90496be9f5bee4992.tar.gz inkscape-5b22a003be75c72b07ae9ed90496be9f5bee4992.zip | |
Use same label for Layers and Objects dialogs
Also prevent crash for unset ids in Object Properties
Fix https://gitlab.com/inkscape/inbox/issues/1129
Diffstat (limited to 'src/ui/dialog/layers.cpp')
| -rw-r--r-- | src/ui/dialog/layers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index 06af29a6e..a2684267b 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -312,9 +312,9 @@ bool LayersPanel::_checkForUpdated(const Gtk::TreePath &/*path*/, const Gtk::Tre * with the correct value (sp-object bug?). So use the inkscape:label attribute instead which * has the correct value (bug #168351) */ - //row[_model->_colLabel] = layer->label() ? layer->label() : layer->getId(); + //row[_model->_colLabel] = layer->label() ? layer->label() : layer->defaultLabel(); gchar const *label = layer->getAttribute("inkscape:label"); - row[_model->_colLabel] = label ? label : layer->getId(); + row[_model->_colLabel] = label ? label : layer->defaultLabel(); row[_model->_colVisible] = SP_IS_ITEM(layer) ? !SP_ITEM(layer)->isHidden() : false; row[_model->_colLocked] = SP_IS_ITEM(layer) ? SP_ITEM(layer)->isLocked() : false; |