mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 06:07:37 +02:00
Code Issues Releases Wiki Activity

Fix hang-on-exit in ScanManager. Turns out all it needed was to be explicitly deleted; I guess the parenting wasn't working right, or something?

Browse Source
This commit is contained in:
Jeff Mitchell
2011-04-06 19:51:58 -04:00
parent 0c52b37bb2
commit 8690a76df7
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/tomahawk/tomahawkapp.h
View File

@@ -44,6 +44,7 @@
class AudioEngine; class AudioEngine;
class Database; class Database;
class ScanManager;
class SipHandler; class SipHandler;
class TomahawkSettings; class TomahawkSettings;
class XMPPBot; class XMPPBot;
@@ -118,6 +119,7 @@ private:
QList<Tomahawk::ExternalResolver*> m_scriptResolvers; QList<Tomahawk::ExternalResolver*> m_scriptResolvers;
Database* m_database; Database* m_database;
ScanManager *m_scanManager;
AudioEngine* m_audioEngine; AudioEngine* m_audioEngine;
SipHandler* m_sipHandler; SipHandler* m_sipHandler;
Servent* m_servent; Servent* m_servent;

5
src/tomahawkapp.cpp
View File

@@ -145,6 +145,7 @@ using namespace Tomahawk;
TomahawkApp::TomahawkApp( int& argc, char *argv[] ) TomahawkApp::TomahawkApp( int& argc, char *argv[] )
: TOMAHAWK_APPLICATION( argc, argv ) : TOMAHAWK_APPLICATION( argc, argv )
, m_database( 0 ) , m_database( 0 )
, m_scanManager( 0 )
, m_audioEngine( 0 ) , m_audioEngine( 0 )
, m_sipHandler( 0 ) , m_sipHandler( 0 )
, m_servent( 0 ) , m_servent( 0 )
@@ -173,7 +174,7 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
new TomahawkSettings( this ); new TomahawkSettings( this );
m_audioEngine = new AudioEngine; m_audioEngine = new AudioEngine;
new ScanManager( this ); m_scanManager = new ScanManager( this );
new Pipeline( this ); new Pipeline( this );
m_servent = new Servent( this ); m_servent = new Servent( this );
@@ -294,7 +295,7 @@ TomahawkApp::~TomahawkApp()
delete m_sipHandler; delete m_sipHandler;
delete m_servent; delete m_servent;
delete m_scanManager;
#ifndef TOMAHAWK_HEADLESS #ifndef TOMAHAWK_HEADLESS
delete m_mainwindow; delete m_mainwindow;
delete m_audioEngine; delete m_audioEngine;