From a21a414615505269bf770ad2358482e698e841af Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Fri, 3 Feb 2017 23:02:37 +0100
Subject: another tweak to maybe-fix crash in Playlist::fade_range()

---
 libs/ardour/playlist.cc | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'libs')

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index af439d7711..7cea903d5d 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -3319,11 +3319,17 @@ void
 Playlist::fade_range (list<AudioRange>& ranges)
 {
 	RegionReadLock rlock (this);
-	 for (list<AudioRange>::iterator r = ranges.begin(); r != ranges.end(); ++r) {
-		 for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
-			 (*i)->fade_range ((*r).start, (*r).end);
-		 }
-	 }
+	for (list<AudioRange>::iterator r = ranges.begin(); r != ranges.end(); ) {
+		list<AudioRange>::iterator tmpr = r;
+		++tmpr;
+		for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ) {
+			RegionList::const_iterator tmpi = i;
+			++tmpi;
+			(*i)->fade_range ((*r).start, (*r).end);
+			i = tmpi;
+		}
+		r = tmpr;
+	}
 }
 
 uint32_t
-- 
cgit v1.2.3