From 56fb0663ee5570bf882ab6120fc4afe4acfb9d2a Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Sun, 21 Mar 2010 14:47:59 +0000
Subject: [PATCH] Fix segfault when a song's tag has changed inbetween runs

---
 src/library.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/library.cpp b/src/library.cpp
index 076f32fae..ed749454f 100644
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -108,7 +108,7 @@ void Library::SongsDiscovered(const SongList& songs) {
       album = artist->ChildByKey(song.album());
       if (album == NULL)
         album = CreateAlbumNode(true, song.album(), artist, song.is_compilation(),
-                                song.art_automatic(), song.art_manual(), album->artist);
+                                song.art_automatic(), song.art_manual(), artist->key);
 
       if (album->lazy_loaded)
         CreateSongNode(true, song, album);
@@ -194,7 +194,7 @@ LibraryItem* Library::CreateAlbumNode(bool signal, const QString& name,
   if (!art_automatic.isNull() && ret->cover_art.isNull())
     ret->cover_art.load(art_automatic);*/
 
-  ret->artist = compilation ? QString::null : artist;
+  ret->artist = compilation ? QString() : artist;
 
   if (signal)
     endInsertRows();