~mhaulo/mixxx/allow-playlist-and-crate-renaming

« back to all changes in this revision

Viewing changes to mixxx/src/library/dao/trackdao.cpp

  • Committer: RJ Ryan
  • Date: 2010-12-02 22:17:33 UTC
  • mfrom: (2423.1.269 mixxx-1.8)
  • Revision ID: rryan@mit.edu-20101202221733-eohxpfli3w8ieksf
MergingĀ fromĀ lp:mixxx/1.8

Show diffs side-by-side

added added

removed removed

Lines of Context:
121
121
 
122
122
            emit(trackClean(trackId));
123
123
        } else {
124
 
            Q_ASSERT(!m_dirtyTracks.contains(trackId));
 
124
            // We don't know why this is happening right now, but this assert is
 
125
            //failing. The condition is mostly harmless, so simply take
 
126
            //corrective action instead of asserting and warn about it in the
 
127
            //log -- rryan 12/2010
 
128
 
 
129
            // Q_ASSERT(!m_dirtyTracks.contains(trackId));
 
130
            if (!m_dirtyTracks.contains(trackId)) {
 
131
                qDebug() << "WARNING: Inconsistent state in TrackDAO. Track is clean while TrackDAO thinks it is dirty. Correcting.";
 
132
                m_dirtyTracks.remove(trackId);
 
133
            }
 
134
 
125
135
            //qDebug() << "Skipping track update for track" << pTrack->getId();
126
136
        }
127
137
    } else {