From 76a8e2b2b24f802a982b6223c89aef8d80d5549f Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sun, 22 Jul 2012 10:58:25 -0400 Subject: [PATCH] Pointer guards --- .../widgets/infowidgets/AlbumInfoWidget.cpp | 8 ++++---- .../widgets/infowidgets/ArtistInfoWidget.cpp | 20 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index bacbc1902..e5a61c1c8 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -87,13 +87,13 @@ AlbumInfoWidget::isBeingPlayed() const //tDebug() << Q_FUNC_INFO << "albumsView playlistInterface = " << ui->albumsView->playlistInterface()->id(); //tDebug() << Q_FUNC_INFO << "tracksView playlistInterface = " << ui->tracksView->playlistInterface()->id(); - if ( ui->albumsView->isBeingPlayed() ) + if ( ui->albumsView && ui->albumsView->isBeingPlayed() ) return true; - if ( ui->albumsView->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() ) + if ( ui->albumsView && ui->albumsView->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() ) return true; - if ( ui->tracksView->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() ) + if ( ui->tracksView && ui->tracksView->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() ) return true; return false; @@ -103,7 +103,7 @@ AlbumInfoWidget::isBeingPlayed() const bool AlbumInfoWidget::jumpToCurrentTrack() { - return ui->albumsView->jumpToCurrentTrack(); + return ui->albumsView && ui->albumsView->jumpToCurrentTrack(); } diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index b533d16a6..086d6ed3d 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -173,19 +173,19 @@ ArtistInfoWidget::playlistInterface() const bool ArtistInfoWidget::isBeingPlayed() const { - if ( ui->albums->isBeingPlayed() ) + if ( ui->albums && ui->albums->isBeingPlayed() ) return true; - if ( ui->relatedArtists->isBeingPlayed() ) + if ( ui->relatedArtists && ui->relatedArtists->isBeingPlayed() ) return true; - if ( ui->albums->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() ) + if ( ui->albums && ui->albums->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() ) return true; - if ( ui->relatedArtists->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() ) + if ( ui->relatedArtists && ui->relatedArtists->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() ) return true; - if ( ui->topHits->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() ) + if ( ui->topHits && ui->topHits->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() ) return true; return false; @@ -195,19 +195,19 @@ ArtistInfoWidget::isBeingPlayed() const bool ArtistInfoWidget::jumpToCurrentTrack() { - if ( ui->albums->jumpToCurrentTrack() ) + if ( ui->albums && ui->albums->jumpToCurrentTrack() ) return true; - if ( ui->relatedArtists->jumpToCurrentTrack() ) + if ( ui->relatedArtists && ui->relatedArtists->jumpToCurrentTrack() ) return true; - if ( ui->topHits->jumpToCurrentTrack() ) + if ( ui->topHits && ui->topHits->jumpToCurrentTrack() ) return true; - if ( ui->albums->jumpToCurrentTrack() ) + if ( ui->albums && ui->albums->jumpToCurrentTrack() ) return true; - if ( ui->relatedArtists->jumpToCurrentTrack() ) + if ( ui->relatedArtists && ui->relatedArtists->jumpToCurrentTrack() ) return true; return false;