From 9df1d1ef2e98a3ecfa40325a5a46223060c1baae Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 10 Oct 2014 14:05:49 +0200
Subject: [PATCH] re-reference regions during uncombine - #5979

---
 libs/ardour/playlist.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 77666977fc..c8cca64b78 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -3038,6 +3038,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
 		}
 
 		boost::shared_ptr<Region> original (ca->second);
+		cassocs.erase(ca);
 		bool modified_region;
 
 		if (i == rl.begin()) {
@@ -3135,6 +3136,9 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
 	for (vector<boost::shared_ptr<Region> >::iterator i = originals.begin(); i != originals.end(); ++i) {
 		add_region ((*i), (*i)->position());
 		set_layer((*i), (*i)->layer());
+		if (!RegionFactory::region_by_id((*i)->id())) {
+			RegionFactory::map_add(*i);
+		}
 	}
 
 	in_partition = false;