From 5d1771a710f446ec71c22dd656cae6dfa23885c7 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 28 Oct 2014 15:39:57 +0100
Subject: [PATCH] Always check return-value of Track's & Result's get() method.

---
 src/libtomahawk/database/DatabaseCommand_AllTracks.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp b/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp
index f0a6220df..61da74976 100644
--- a/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp
@@ -144,12 +144,16 @@ DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi )
                                                       artist, track, album,
                                                       duration, composer,
                                                       albumpos, discnumber );
+        if ( !t )
+            continue;
 
-        if ( m_album || m_artist ) {
+        if ( m_album || m_artist )
             t->loadAttributes();
-        }
 
         Tomahawk::result_ptr result = Tomahawk::Result::get( url, t );
+        if ( !result )
+            continue;
+
         result->setSize( size );
         result->setBitrate( bitrate );
         result->setModificationTime( modificationTime );