From 60d11db923705f607cead38160acbf84ef3b73b5 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Mon, 12 Mar 2012 21:39:56 -0400
Subject: [PATCH] TWK-750: Properly check if last.fm was enabled during
 accounts migration

---
 src/libtomahawk/tomahawksettings.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/libtomahawk/tomahawksettings.cpp b/src/libtomahawk/tomahawksettings.cpp
index 8a7da5509..f6c9e210c 100644
--- a/src/libtomahawk/tomahawksettings.cpp
+++ b/src/libtomahawk/tomahawksettings.cpp
@@ -341,7 +341,16 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
         const QString lfmPassword = value( "lastfm/password" ).toString();
         const bool scrobble = value( "lastfm/enablescrobbling", false ).toBool();
         beginGroup( "accounts/" + accountKey );
-        setValue( "enabled", enabledResolvers.contains( "lastfm" ) == true );
+        bool hasLastFmEnabled = false;
+        foreach ( const QString& r, enabledResolvers )
+        {
+            if ( r.contains( "lastfm" ) )
+            {
+                hasLastFmEnabled = true;
+                break;
+            }
+        }
+        setValue( "enabled", hasLastFmEnabled );
         setValue( "autoconnect", true );
         setValue( "types", QStringList() << "ResolverType" << "StatusPushType" );
         QVariantHash credentials;