diff options
| author | Bryce Harrington <bryce@bryceharrington.org> | 2007-01-10 08:56:04 +0000 |
|---|---|---|
| committer | bryce <bryce@users.sourceforge.net> | 2007-01-10 08:56:04 +0000 |
| commit | efd9fb4542bb868bb22418cc6b4ef5c827926784 (patch) | |
| tree | a4efc84e4028e584376ea3779931658e370b8477 /src/dialogs | |
| parent | adding user manual author (diff) | |
| download | inkscape-efd9fb4542bb868bb22418cc6b4ef5c827926784.tar.gz inkscape-efd9fb4542bb868bb22418cc6b4ef5c827926784.zip | |
Only evaluate stock markers if the inkscape:stockid tag is actually
defined.
Fixes bug 1631906.
(bzr r2170)
Diffstat (limited to 'src/dialogs')
| -rw-r--r-- | src/dialogs/stroke-style.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/dialogs/stroke-style.cpp b/src/dialogs/stroke-style.cpp index ebfb7aca6..3db6c62ee 100644 --- a/src/dialogs/stroke-style.cpp +++ b/src/dialogs/stroke-style.cpp @@ -756,11 +756,13 @@ sp_marker_list_from_doc (GtkWidget *m, SPDocument *current_doc, SPDocument *sour Inkscape::XML::Node *repr = SP_OBJECT_REPR((SPItem *) ml->data); bool stock_dupe = false; - GSList * markers_doc_ml = ink_marker_list_get(markers_doc); - for (; markers_doc_ml != NULL; markers_doc_ml = markers_doc_ml->next) { - const gchar* stockid = SP_OBJECT_REPR(markers_doc_ml->data)->attribute("inkscape:stockid"); - if (stockid && !strcmp(repr->attribute("inkscape:stockid"), stockid)) - stock_dupe = true; + if (repr->attribute("inkscape:stockid")) { + GSList * markers_doc_ml = ink_marker_list_get(markers_doc); + for (; markers_doc_ml != NULL; markers_doc_ml = markers_doc_ml->next) { + const gchar* stockid = SP_OBJECT_REPR(markers_doc_ml->data)->attribute("inkscape:stockid"); + if (stockid && !strcmp(repr->attribute("inkscape:stockid"), stockid)) + stock_dupe = true; + } } if (stock_dupe) // stock item, dont add to list from current doc |