1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00

Merge branch 'decltest' of github.com:tomahawk-player/tomahawk into decltest

This commit is contained in:
Michael Zanetti
2012-07-14 16:20:12 +02:00
2 changed files with 8 additions and 1 deletions

View File

@@ -201,9 +201,12 @@ Album::id() const
m_waitingForId = false;
if ( m_id > 0 )
{
QMutexLocker lock( &s_mutex );
s_albumsById[ m_id ] = m_ownRef.toStrongRef();
s_idMutex.unlock();
}
s_idMutex.unlock();
}
return finalId;

View File

@@ -280,7 +280,11 @@ Artist::id() const
m_waitingForFuture = false;
if ( m_id > 0 )
{
QMutexLocker lock( &s_mutex );
s_artistsById[ m_id ] = m_ownRef.toStrongRef();
}
s_idMutex.unlock();
}