diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2020-07-12 22:57:12 +0200 |
---|---|---|
committer | Uwe Klotz <uklotz@mixxx.org> | 2020-07-12 22:59:24 +0200 |
commit | 0068b27c94a38f259b1ce4b9a4c42cf2be812879 (patch) | |
tree | e8171464e95ef86dc01f9407505baad02e6435b3 /src/track | |
parent | ae2988b6feb4c1a73b398bab21ffebcc397a9701 (diff) |
Account for duplicate initialization of track id
Diffstat (limited to 'src/track')
-rw-r--r-- | src/track/track.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/track/track.cpp b/src/track/track.cpp index 2748ed3b0d..8912185938 100644 --- a/src/track/track.cpp +++ b/src/track/track.cpp @@ -681,9 +681,13 @@ TrackId Track::getId() const { void Track::initId(TrackId id) { QMutexLocker lock(&m_qMutex); + DEBUG_ASSERT(id.isValid()); + if (m_record.getId() == id) { + return; + } // The track's id must be set only once and immediately after // the object has been created. - VERIFY_OR_DEBUG_ASSERT(!m_record.getId().isValid() || (m_record.getId() == id)) { + VERIFY_OR_DEBUG_ASSERT(!m_record.getId().isValid()) { kLogger.warning() << "Cannot change id from" << m_record.getId() << "to" << id; return; // abort |