summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2015-05-02 19:48:52 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2015-05-02 19:48:52 +0000
commitf893425c4e9d23a438fb34b9f4bccd409650d484 (patch)
tree89c1fd7b848b1f9d1fbc7d123df491426ad7e88f /src
parentcmake: add support for librevenge-based input formats (WPG, Visio, CDR) (diff)
downloadinkscape-f893425c4e9d23a438fb34b9f4bccd409650d484.tar.gz
inkscape-f893425c4e9d23a438fb34b9f4bccd409650d484.zip
fix crash when setting clip
(bzr r14094)
Diffstat (limited to 'src')
-rw-r--r--src/selection-chemistry.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 68adf5381..f444f4217 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -3884,17 +3884,18 @@ void sp_selection_set_mask(SPDesktop *desktop, bool apply_clip_path, bool apply_
items_to_select.push_back(*i);
}
} else {
- GSList *i = NULL;
- for (std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++) {
- apply_to_items = g_slist_prepend(apply_to_items, *i);
- items_to_select.push_back(*i);
+ SPItem *i = NULL;
+ for (std::vector<SPItem*>::const_iterator j=items.begin();j!=items.end();j++) {
+ i=*j;
+ apply_to_items = g_slist_prepend(apply_to_items, i);
+ items_to_select.push_back(i);
}
- Inkscape::XML::Node *dup = SP_OBJECT(i->data)->getRepr()->duplicate(xml_doc);
+ Inkscape::XML::Node *dup = SP_OBJECT(i)->getRepr()->duplicate(xml_doc);
mask_items = g_slist_prepend(mask_items, dup);
if (remove_original) {
- SPObject *item = reinterpret_cast<SPObject*>(i->data);
+ SPObject *item = reinterpret_cast<SPObject*>(i);
items_to_delete = g_slist_prepend(items_to_delete, item);
}
}