From b36e085001cabc13f20f6b6779d08d9816d76b00 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 21 Apr 2013 18:57:55 -0400
Subject: [PATCH] add back change lost during branch merging

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

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);
 	}