mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-12 09:04:33 +02:00
Merge remote-tracking branch 'origin' into phonon
This commit is contained in:
@@ -22,7 +22,8 @@ Album::get( unsigned int id, const QString& name, const Tomahawk::artist_ptr& ar
|
|||||||
}
|
}
|
||||||
|
|
||||||
album_ptr a = album_ptr( new Album( id, name, artist ) );
|
album_ptr a = album_ptr( new Album( id, name, artist ) );
|
||||||
s_albums.insert( id, a );
|
if ( id > 0 )
|
||||||
|
s_albums.insert( id, a );
|
||||||
|
|
||||||
return a;
|
return a;
|
||||||
}
|
}
|
||||||
|
@@ -25,7 +25,6 @@ Artist::get( unsigned int id, const QString& name )
|
|||||||
}
|
}
|
||||||
|
|
||||||
artist_ptr a = artist_ptr( new Artist( id, name ) );
|
artist_ptr a = artist_ptr( new Artist( id, name ) );
|
||||||
|
|
||||||
if ( id > 0 )
|
if ( id > 0 )
|
||||||
s_artists.insert( id, a );
|
s_artists.insert( id, a );
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user