summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/object-properties.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebronyat-signgmaildotcom>2014-03-12 12:56:04 +0000
committerLiam P. White <inkscapebronyat-signgmaildotcom>2014-03-12 12:56:04 +0000
commit13c192e2fa564c0a743e13e30b1cf6de9b1a39a6 (patch)
tree3e2b6a003977c53609cac33d16abf38de4954c5f /src/ui/dialog/object-properties.cpp
parentUpdate to trunk (diff)
downloadinkscape-13c192e2fa564c0a743e13e30b1cf6de9b1a39a6.tar.gz
inkscape-13c192e2fa564c0a743e13e30b1cf6de9b1a39a6.zip
Reverted swatches
Removed a toy effect (not ready yet) Fixed a bug with Livarot General cleanup (bzr r13090.1.23)
Diffstat (limited to 'src/ui/dialog/object-properties.cpp')
-rw-r--r--src/ui/dialog/object-properties.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp
index 82b2cf6b1..8f36cba43 100644
--- a/src/ui/dialog/object-properties.cpp
+++ b/src/ui/dialog/object-properties.cpp
@@ -467,6 +467,7 @@ void ObjectProperties::label_changed(void)
blocked = true;
/* Retrieve the label widget for the object's id */
+ //bug 1290573: getId() crashes after undo (cannot create string from NULL ptr)
gchar *id = g_strdup(EntryID.get_text().c_str());
g_strcanon (id, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.:", '_');
if (!strcmp (id, item->getId())) {