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

Do not leak the Query object

Browse Source
This commit is contained in:
Uwe L. Korn
2014-10-27 11:17:58 +01:00
parent 492a6c0a0d
commit acdf5b9635
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/database-reader/fuzzysearch.cpp
View File

@@ -21,6 +21,7 @@ public:
database->loadIndex(); database->loadIndex();
} }
Tomahawk::query_ptr query;
Tomahawk::dbcmd_ptr cmd; Tomahawk::dbcmd_ptr cmd;
QSharedPointer<Tomahawk::Database> database; QSharedPointer<Tomahawk::Database> database;
@@ -30,10 +31,16 @@ public slots:
database->enqueue( cmd ); database->enqueue( cmd );
} }
void onResults( const Tomahawk::QID, QList< Tomahawk::result_ptr> results ) void onResults( const Tomahawk::QID, const QList< Tomahawk::result_ptr>& results )
{ {
// TODO // Query is destructed by deleteLater() so we need to wait for the
QMetaObject::invokeMethod( thread(), "quit", Qt::QueuedConnection ); // event queue to process it.
connect( query.data(), SIGNAL( destroyed( QObject* ) ),
thread(), SLOT( quit() ) );
// Remove references to local objects, so they are queued for destruction.
cmd.clear();
query.clear();
} }
}; };
@@ -61,8 +68,9 @@ int main( int argc, char* argv[] )
tasks.moveToThread( &thread ); tasks.moveToThread( &thread );
// Load the Database // Load the Database
Tomahawk::query_ptr query( Tomahawk::Query::get( "Bloc Party", QString() ) ); tasks.query = Tomahawk::Query::get( "Bloc Party", QString() );
Tomahawk::DatabaseCommand_Resolve* cmd = new Tomahawk::DatabaseCommand_Resolve( query ); tasks.query->moveToThread( &thread );
Tomahawk::DatabaseCommand_Resolve* cmd = new Tomahawk::DatabaseCommand_Resolve( tasks.query );
tasks.cmd = Tomahawk::dbcmd_ptr( cmd ); tasks.cmd = Tomahawk::dbcmd_ptr( cmd );
tasks.cmd->moveToThread( &thread ); tasks.cmd->moveToThread( &thread );
QObject::connect( cmd, SIGNAL( results( Tomahawk::QID, QList<Tomahawk::result_ptr> ) ), QObject::connect( cmd, SIGNAL( results( Tomahawk::QID, QList<Tomahawk::result_ptr> ) ),