diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-05-13 18:17:55 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-05-13 18:17:55 +0200 |
| commit | 14d12aa33947072aac1beaab648816e21f844c7c (patch) | |
| tree | 0f2ed62f175ed8c8439dd682f0198011b4c11878 /src/track | |
| parent | c2da82004f5785b1b23895b333e19a4dbf2f035e (diff) | |
| parent | d7b5e1b71631b960cffa6506a2d5746c05aa7bdf (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
Diffstat (limited to 'src/track')
| -rw-r--r-- | src/track/beatmap.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/track/beatmap.cpp b/src/track/beatmap.cpp index 37dc5e51fe..661f79e9f9 100644 --- a/src/track/beatmap.cpp +++ b/src/track/beatmap.cpp @@ -465,8 +465,9 @@ void BeatMap::addBeat(double dBeatSample) { // Don't insert a duplicate beat. TODO(XXX) determine what epsilon to // consider a beat identical to another. - if (it->frame_position() == beat.frame_position()) + if (it != m_beats.end() && it->frame_position() == beat.frame_position()) { return; + } m_beats.insert(it, beat); onBeatlistChanged(); |