1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 05:07:27 +02:00

* Disconnect from previous query correctly.

This commit is contained in:
Christian Muehlhaeuser
2013-06-12 06:06:46 +02:00
parent fe1bd649bd
commit 00eb60b41a

View File

@@ -175,12 +175,6 @@ TrackInfoWidget::jumpToCurrentTrack()
void void
TrackInfoWidget::load( const query_ptr& query ) TrackInfoWidget::load( const query_ptr& query )
{ {
m_query = query;
m_artist = Artist::get( m_query->track()->artist() );
m_title = QString( "%1 - %2" ).arg( query->track()->artist() ).arg( query->track()->track() );
ui->trackLabel->setText( m_query->track()->track() );
ui->artistLabel->setArtist( m_query->track()->artistPtr() );
if ( !m_query.isNull() ) if ( !m_query.isNull() )
{ {
disconnect( m_query->track().data(), SIGNAL( lyricsLoaded() ), this, SLOT( onLyricsLoaded() ) ); disconnect( m_query->track().data(), SIGNAL( lyricsLoaded() ), this, SLOT( onLyricsLoaded() ) );
@@ -191,6 +185,12 @@ TrackInfoWidget::load( const query_ptr& query )
disconnect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), this, SLOT( onSimilarArtistsLoaded() ) ); disconnect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), this, SLOT( onSimilarArtistsLoaded() ) );
} }
m_query = query;
m_artist = Artist::get( m_query->track()->artist() );
m_title = QString( "%1 - %2" ).arg( query->track()->artist() ).arg( query->track()->track() );
ui->trackLabel->setText( m_query->track()->track() );
ui->artistLabel->setArtist( m_query->track()->artistPtr() );
connect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), SLOT( onSimilarArtistsLoaded() ) ); connect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), SLOT( onSimilarArtistsLoaded() ) );
connect( m_artist.data(), SIGNAL( statsLoaded() ), SLOT( onStatsLoaded() ) ); connect( m_artist.data(), SIGNAL( statsLoaded() ), SLOT( onStatsLoaded() ) );
connect( m_query->track().data(), SIGNAL( lyricsLoaded() ), SLOT( onLyricsLoaded() ) ); connect( m_query->track().data(), SIGNAL( lyricsLoaded() ), SLOT( onLyricsLoaded() ) );