X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcpomatic_time_coalesce.h;fp=src%2Flib%2Fdcpomatic_time_coalesce.h;h=56f82bcb680932b1bb8ff86a263dddf594093892;hb=a632e34e3c9ca94574fcab1b3006227ed2833766;hp=e6e16641ef7e65091993dbe1d4e1b892fac0eeae;hpb=39fce9acb7869c551fded172aa070d75c7a9bc50;p=dcpomatic.git

diff --git a/src/lib/dcpomatic_time_coalesce.h b/src/lib/dcpomatic_time_coalesce.h
index e6e16641e..56f82bcb6 100644
--- a/src/lib/dcpomatic_time_coalesce.h
+++ b/src/lib/dcpomatic_time_coalesce.h
@@ -32,11 +32,11 @@ std::list<TimePeriod<T> > coalesce (std::list<TimePeriod<T> > periods)
 	do {
 		coalesced.clear ();
 		did_something = false;
-		for (typename std::list<TimePeriod<T> >::const_iterator i = periods.begin(); i != periods.end(); ++i) {
-			typename std::list<TimePeriod<T> >::const_iterator j = i;
+		for (auto i = periods.begin(); i != periods.end(); ++i) {
+			auto j = i;
 			++j;
 			if (j != periods.end() && (i->overlap(*j) || i->to == j->from)) {
-				coalesced.push_back (TimePeriod<T> (i->from, j->to));
+				coalesced.push_back(TimePeriod<T>(std::min(i->from, j->from), std::max(i->to, j->to)));
 				did_something = true;
 				++i;
 			} else {