From 7845224bbaaac34e9b600b2db64fce3ffb429e4a Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Fri, 22 Aug 2014 22:36:13 +0100
Subject: [PATCH] Only delete AtticaManager if ever created

---
 src/libtomahawk/AtticaManager.h | 14 ++++++++++++++
 src/tomahawk/TomahawkApp.cpp    |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/libtomahawk/AtticaManager.h b/src/libtomahawk/AtticaManager.h
index 91fd5df54..dacfdfb44 100644
--- a/src/libtomahawk/AtticaManager.h
+++ b/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();
 
diff --git a/src/tomahawk/TomahawkApp.cpp b/src/tomahawk/TomahawkApp.cpp
index d28c72e1b..31edbf39f 100644
--- a/src/tomahawk/TomahawkApp.cpp
+++ b/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.