summaryrefslogtreecommitdiff
path: root/libs/canvas/item.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-04-21 13:10:42 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-04-21 15:35:20 -0400
commitb02a7445bfa11d1c1ea1f6762b7e845b780ab4ea (patch)
treeb146dedc8b854adda7073b89a9bb7ba26315aa0d /libs/canvas/item.cc
parentfca81c9a6a591b6f94223454a981d919c9ad51a5 (diff)
Revert "add Group::clear(), do not clear _canvas member of Item when unparented (only the parent is changed)"
This reverts commit a4df65a56f83823aba27432685977f420458a213.
Diffstat (limited to 'libs/canvas/item.cc')
-rw-r--r--libs/canvas/item.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/canvas/item.cc b/libs/canvas/item.cc
index 786c2f81cd..f5aa39d20d 100644
--- a/libs/canvas/item.cc
+++ b/libs/canvas/item.cc
@@ -236,14 +236,13 @@ Item::parent_to_item (ArdourCanvas::Rect const & d) const
void
Item::unparent ()
{
+ _canvas = 0;
_parent = 0;
}
void
Item::reparent (Group* new_parent)
{
- assert (_canvas == _parent->canvas ());
-
if (_parent) {
_parent->remove (this);
}
@@ -251,6 +250,7 @@ Item::reparent (Group* new_parent)
assert (new_parent);
_parent = new_parent;
+ _canvas = _parent->canvas ();
_parent->add (this);
}