From 1994ab33feaf1f50e8e4134d91b745623ed96193 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Fri, 26 Aug 2011 13:26:54 -0400
Subject: [PATCH] Don't depend on sender() as it can be null in queued events

---
 src/libtomahawk/playlist/albummodel.cpp | 7 ++++---
 src/libtomahawk/playlist/albummodel.h   | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libtomahawk/playlist/albummodel.cpp b/src/libtomahawk/playlist/albummodel.cpp
index 4ed4ecb1d..ebb2bb002 100644
--- a/src/libtomahawk/playlist/albummodel.cpp
+++ b/src/libtomahawk/playlist/albummodel.cpp
@@ -35,6 +35,7 @@ using namespace Tomahawk;
 AlbumModel::AlbumModel( QObject* parent )
     : QAbstractItemModel( parent )
     , m_rootItem( new AlbumItem( 0, this ) )
+    , m_overwriteOnAdd( false )
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -243,7 +244,7 @@ AlbumModel::addCollection( const collection_ptr& collection, bool overwrite )
                             << collection->source()->userName();
 
     DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums( collection );
-    cmd->setProperty( "overwrite", overwrite );
+    m_overwriteOnAdd = overwrite;
 
     connect( cmd, SIGNAL( albums( QList<Tomahawk::album_ptr>, QVariant ) ),
                     SLOT( addAlbums( QList<Tomahawk::album_ptr> ) ) );
@@ -266,7 +267,7 @@ AlbumModel::addFilteredCollection( const collection_ptr& collection, unsigned in
     cmd->setLimit( amount );
     cmd->setSortOrder( order );
     cmd->setSortDescending( true );
-    cmd->setProperty( "overwrite", overwrite );
+    m_overwriteOnAdd = overwrite;
 
     connect( cmd, SIGNAL( albums( QList<Tomahawk::album_ptr>, QVariant ) ),
                     SLOT( addAlbums( QList<Tomahawk::album_ptr> ) ) );
@@ -286,7 +287,7 @@ AlbumModel::addAlbums( const QList<Tomahawk::album_ptr>& albums )
     if ( !albums.count() )
         return;
 
-    if ( sender() && sender()->property( "overwrite" ).toBool() )
+    if ( m_overwriteOnAdd )
         clear();
 
     int c = rowCount( QModelIndex() );
diff --git a/src/libtomahawk/playlist/albummodel.h b/src/libtomahawk/playlist/albummodel.h
index 574bf8086..18945f4f4 100644
--- a/src/libtomahawk/playlist/albummodel.h
+++ b/src/libtomahawk/playlist/albummodel.h
@@ -109,6 +109,7 @@ private:
 
     QString m_title;
     QString m_description;
+    bool m_overwriteOnAdd;
 };
 
 #endif // ALBUMMODEL_H