summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-02-11 22:49:39 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2014-02-11 22:49:39 -0500
commit6876906d9db3f12fdf4b6e6ec621cb3fc99910dc (patch)
treeb987ae4932a16511effdc7c9f95030f6c9a0377b /libs
parenta329a44cc10c7b0772dc1dc5d3c66a90b117d346 (diff)
fix major thinko in ArdourCanvas::Group::clear()
Diffstat (limited to 'libs')
-rw-r--r--libs/canvas/group.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/libs/canvas/group.cc b/libs/canvas/group.cc
index 619444c4e6..bb917503f6 100644
--- a/libs/canvas/group.cc
+++ b/libs/canvas/group.cc
@@ -58,11 +58,7 @@ Group::Group (Group* parent, Duple position)
Group::~Group ()
{
- for (list<Item*>::iterator i = _items.begin(); i != _items.end(); ++i) {
- (*i)->unparent ();
- }
-
- _items.clear ();
+ clear (true);
}
/** @param area Area to draw in this group's coordinates.
@@ -219,10 +215,11 @@ Group::clear (bool with_delete)
begin_change ();
for (list<Item*>::iterator i = _items.begin(); i != _items.end(); ++i) {
+
+ (*i)->unparent ();
+
if (with_delete) {
delete *i;
- } else {
- (*i)->unparent ();
}
}