From 7758cbb91f916eec948a337b08e9ba2331f48371 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Fri, 3 Oct 2014 00:28:41 +0200
Subject: [PATCH] * Wipe index on upgrade to settings version 17.

---
 src/libtomahawk/TomahawkSettings.cpp | 7 +++++++
 src/libtomahawk/TomahawkSettings.h   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/libtomahawk/TomahawkSettings.cpp b/src/libtomahawk/TomahawkSettings.cpp
index 975df1838..a2205a88a 100644
--- a/src/libtomahawk/TomahawkSettings.cpp
+++ b/src/libtomahawk/TomahawkSettings.cpp
@@ -676,6 +676,10 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
     else if ( oldVersion == 15 )
     {
         // 0.8.0 switches to Lucene++. Force a reindex.
+        // updateIndex();
+    }
+    else if ( oldVersion == 16 )
+    {
         updateIndex();
     }
 }
@@ -1524,12 +1528,15 @@ TomahawkSettings::setPrivateListeningMode( TomahawkSettings::PrivateListeningMod
 void
 TomahawkSettings::updateIndex()
 {
+    tDebug() << Q_FUNC_INFO;
     if ( !Database::instance() || !Database::instance()->isReady() )
     {
         QTimer::singleShot( 0, this, SLOT( updateIndex() ) );
         return;
     }
 
+    tDebug() << Q_FUNC_INFO << "Wiping index.";
+    Database::instance()->wipeIndex();
     Tomahawk::DatabaseCommand* cmd = new Tomahawk::DatabaseCommand_UpdateSearchIndex();
     Database::instance()->enqueue( QSharedPointer<Tomahawk::DatabaseCommand>( cmd ) );
 }
diff --git a/src/libtomahawk/TomahawkSettings.h b/src/libtomahawk/TomahawkSettings.h
index 9047c7da8..c2ed91f72 100644
--- a/src/libtomahawk/TomahawkSettings.h
+++ b/src/libtomahawk/TomahawkSettings.h
@@ -31,7 +31,7 @@
 #include <QNetworkProxy>
 #include <QStringList>
 
-#define TOMAHAWK_SETTINGS_VERSION 16
+#define TOMAHAWK_SETTINGS_VERSION 17
 
 /**
  * Convenience wrapper around QSettings for tomahawk-specific config