Tempo cramps - do not allow tempos to share the same frame.

2016-03-29 22:09:39 +11:00
parent a53d94c3d0
commit 26bbffda7f
1 changed files with 5 additions and 0 deletions
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -1988,6 +1988,11 @@ TempoMap::check_solved (Metrics& metrics, bool by_frame)
 				if ((by_frame && t->frame() < prev_ts->frame()) || (!by_frame && t->pulse() < prev_ts->pulse())) {
 					return false;
 				}
+
+				if (t->frame() == prev_ts->frame()) {
+					return false;
+				}
+
 				/* precision check ensures pulses and frames align independent of lock style.*/
 				if (by_frame && t->frame() != prev_ts->frame_at_pulse (t->pulse(), _frame_rate)) {
 					return false;