From 435770c5570891a3e593d31cab97bb334d0ab3ab Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 28 Sep 2014 14:17:41 +0100 Subject: [PATCH] Fix Result::toString to work with m_track == nullptr --- src/libtomahawk/Result.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/libtomahawk/Result.cpp b/src/libtomahawk/Result.cpp index 9a5a94c48..b2f207d16 100644 --- a/src/libtomahawk/Result.cpp +++ b/src/libtomahawk/Result.cpp @@ -233,13 +233,21 @@ Result::toVariant() const QString Result::toString() const { - return QString( "Result(%1, score: %2) %3 - %4%5 (%6)" ) - .arg( id() ) - .arg( m_score ) - .arg( m_track->artist() ) - .arg( m_track->track() ) - .arg( m_track->album().isEmpty() ? QString() : QString( " on %1" ).arg( m_track->album() ) ) - .arg( m_url ); + if ( m_track ) + { + return QString( "Result(%1, score: %2) %3 - %4%5 (%6)" ) + .arg( id() ) + .arg( m_score ) + .arg( m_track->artist() ) + .arg( m_track->track() ) + .arg( m_track->album().isEmpty() ? QString() : QString( " on %1" ).arg( m_track->album() ) ) + .arg( m_url ); + } else { + return QString( "Result(%1, score: %2) (%3)" ) + .arg( id() ) + .arg( m_score ) + .arg( m_url ); + } }