From 7e14351aee59c83d71b4b1d137138a1e5874632b Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 24 Mar 2008 18:38:09 +0000
Subject: [PATCH] stop crash occuring when carrying out playlist partitions in
 empty playlists

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3176 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/audioregion.cc | 13 +++++++++++++
 libs/ardour/playlist.cc    |  4 ----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 5b087011a9..497c41c7c5 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -324,6 +324,9 @@ AudioRegion::~AudioRegion ()
 		for (SourceList::const_iterator i = sources.begin(); i != sources.end(); ++i) {
 			(*i)->remove_playlist (pl);
 		}
+		for (SourceList::const_iterator i = master_sources.begin(); i != master_sources.end(); ++i) {
+			(*i)->remove_playlist (pl);
+		}
 	}
 
 	notify_callbacks ();
@@ -1505,16 +1508,26 @@ AudioRegion::set_playlist (boost::weak_ptr<Playlist> wpl)
 				(*i)->remove_playlist (_playlist);	
 				(*i)->add_playlist (pl);
 			}
+			for (SourceList::const_iterator i = master_sources.begin(); i != master_sources.end(); ++i) {
+				(*i)->remove_playlist (_playlist);	
+				(*i)->add_playlist (pl);
+			}
 		} else {
 			for (SourceList::const_iterator i = sources.begin(); i != sources.end(); ++i) {
 				(*i)->add_playlist (pl);
 			}
+			for (SourceList::const_iterator i = master_sources.begin(); i != master_sources.end(); ++i) {
+				(*i)->add_playlist (pl);
+			}
 		}
 	} else {
 		if (old_playlist) {
 			for (SourceList::const_iterator i = sources.begin(); i != sources.end(); ++i) {
 				(*i)->remove_playlist (old_playlist);
 			}
+			for (SourceList::const_iterator i = master_sources.begin(); i != master_sources.end(); ++i) {
+				(*i)->remove_playlist (old_playlist);
+			}
 		}
 	}
 }
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index b54963cf3c..09fd035c6e 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -850,10 +850,6 @@ Playlist::partition_internal (nframes_t start, nframes_t end, bool cutting, Regi
 			}
 		}
 		
-		if (current->first_frame() >= current->last_frame()) {
-			PBD::stacktrace (cerr);
-		}
-
 		in_partition = false;
 	}