1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 19:30:21 +02:00

* Should fix shutdown sequence.

This commit is contained in:
Christian Muehlhaeuser
2011-10-29 08:49:42 +02:00
parent 47cd4de267
commit 5ea8586c59

View File

@@ -181,8 +181,6 @@ TomahawkApp::init()
TomahawkUtils::setProxyFactory( proxyFactory );
Echonest::Config::instance()->setAPIKey( "JRIHWEP6GPOER2QQ6" );
m_audioEngine = QWeakPointer<AudioEngine>( new AudioEngine );
m_scanManager = QWeakPointer<ScanManager>( new ScanManager( this ) );
new Pipeline( this );
@@ -225,7 +223,6 @@ TomahawkApp::init()
Echonest::Config::instance()->setAPIKey( "JRIHWEP6GPOER2QQ6" );
Echonest::Config::instance()->setNetworkAccessManager( TomahawkUtils::nam() );
EchonestGenerator::setupCatalogs();
#ifndef TOMAHAWK_HEADLESS
@@ -305,10 +302,11 @@ TomahawkApp::~TomahawkApp()
delete SipHandler::instance();
Pipeline::instance()->stop();
if ( !m_database.isNull() )
delete m_database.data();
Pipeline::instance()->stop();
delete Pipeline::instance();
#ifndef TOMAHAWK_HEADLESS