diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-21 18:57:55 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-21 18:57:55 -0400 |
| commit | b36e085001cabc13f20f6b6779d08d9816d76b00 (patch) | |
| tree | 0b9be1c883d8237dacee3aa02c8741b36245069e /libs/canvas/item.cc | |
| parent | 0a2a8762482f14d1b8a7fdd5117547a4a917c7af (diff) | |
add back change lost during branch merging
Diffstat (limited to 'libs/canvas/item.cc')
| -rw-r--r-- | libs/canvas/item.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/canvas/item.cc b/libs/canvas/item.cc index f5aa39d20d..d316a6c05d 100644 --- a/libs/canvas/item.cc +++ b/libs/canvas/item.cc @@ -236,13 +236,14 @@ 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); } |