Commit ae35ba41 authored by Matěj Laitl's avatar Matěj Laitl
Browse files

Revert "Fix: Amarok crashes on start if a playlist source is unavailable"

This reverts commit 31f75878.

Ralf, this is not the Q_ASSERT in SqlScanResultProcessor.cpp that fails,
it is the metaTrack-> (i.e. KShatedPtr::operator->) that fails!

This needs to be solved differently, reverting this for now.

CCBUG: 313460
parent 984ff1e0
......@@ -170,7 +170,7 @@ SqlScanResultProcessor::commitTrack( CollectionScanner::Track *track,
entry.directoryId = directoryId;
metaTrack = Meta::SqlTrackPtr::staticCast( m_collection->registry()->getTrack( urlId ) );
// Q_ASSERT( metaTrack->urlId() == entry.id ); crashes. See BR 313460
Q_ASSERT( metaTrack->urlId() == entry.id );
}
// find an existing track by path
else if( m_pathCache.contains( track->path() ) )
......@@ -182,7 +182,7 @@ SqlScanResultProcessor::commitTrack( CollectionScanner::Track *track,
entry.directoryId = directoryId;
metaTrack = Meta::SqlTrackPtr::staticCast( m_collection->registry()->getTrack( urlId ) );
// Q_ASSERT( metaTrack->urlId() == entry.id ); crashes. See BR 313460
Q_ASSERT( metaTrack->urlId() == entry.id );
}
// create a new one
else
......@@ -481,7 +481,7 @@ SqlScanResultProcessor::removeTrack( const UrlEntry &entry )
SqlRegistry *reg = m_collection->registry();
// we must get the track by id, uid is not unique
Meta::SqlTrackPtr track = Meta::SqlTrackPtr::staticCast( reg->getTrack( entry.id ) );
// Q_ASSERT( track->urlId() == entry.id ); crashes. See BR 313460
Q_ASSERT( track->urlId() == entry.id );
track->remove();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment