From fca81c9a6a591b6f94223454a981d919c9ad51a5 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 21 Apr 2013 13:10:27 -0400
Subject: add Group::clear(), do not clear _canvas member of Item when
 unparented (only the parent is changed)

---
 libs/canvas/item.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libs/canvas/item.cc')

diff --git a/libs/canvas/item.cc b/libs/canvas/item.cc
index f5aa39d20d..786c2f81cd 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);
 	}
@@ -250,7 +251,6 @@ Item::reparent (Group* new_parent)
 	assert (new_parent);
 
 	_parent = new_parent;
-	_canvas = _parent->canvas ();
 	_parent->add (this);
 }
 
-- 
cgit v1.2.3