summaryrefslogtreecommitdiffstats
path: root/src/selection-chemistry.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2014-02-27 04:19:36 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2014-02-27 04:19:36 +0000
commit6a9254d69806df5ac3f4c8eb6edc1b0cca57160e (patch)
treef224432a27f263251b7b04da1091a2ce43465aa4 /src/selection-chemistry.cpp
parentPartial fix for LP #1001756 (crash when ungrouping a selection (diff)
downloadinkscape-6a9254d69806df5ac3f4c8eb6edc1b0cca57160e.tar.gz
inkscape-6a9254d69806df5ac3f4c8eb6edc1b0cca57160e.zip
Correct the ungrouping logic so that selected clones of selected groups
are only unlinked, with the resulting groups not ungrouped (bzr r13064)
Diffstat (limited to 'src/selection-chemistry.cpp')
-rw-r--r--src/selection-chemistry.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index ea95cecd8..821d078d1 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -840,8 +840,8 @@ void sp_selection_ungroup(Inkscape::Selection *selection, SPDesktop *desktop)
for (GSList *item = items; item; item = item->next) {
SPItem *obj = static_cast<SPItem *>(item->data);
- // do not ungroup switches
- if (SP_IS_GROUP(obj) && !SP_IS_SWITCH(obj)) {
+ // ungroup only the groups marked earlier
+ if (g_slist_find(groups, item->data) != NULL) {
GSList *children = NULL;
sp_item_group_ungroup(SP_GROUP(obj), &children, false);
// add the items resulting from ungrouping to the selection