Only delete AtticaManager if ever created

src/libtomahawk/AtticaManager.h

@@ -79,6 +79,20 @@ public:
         return s_instance;
     }
 
+    /**
+     * Delete the AtticaManager if initialised.
+     *
+     * Note that <code>delete AtticaManager::instance()</code> will create an
+     * instance if none existed before.
+     */
+    static void deleteInstace()
+    {
+        if ( s_instance )
+        {
+            delete s_instance;
+        }
+    }
+
     explicit AtticaManager ( QObject* parent = 0 );
     virtual ~AtticaManager();
 

src/tomahawk/TomahawkApp.cpp

@@ -302,7 +302,7 @@ TomahawkApp::~TomahawkApp()
         delete m_scanManager.data();
 
     delete Tomahawk::Accounts::AccountManager::instance();
-    delete AtticaManager::instance();
+    AtticaManager::deleteInstace();
     delete m_mainwindow;
 
     // Main Window uses the AudioEngine, so delete it later.