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

* Delete obsolete singleton commands on startup.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-10-18 12:57:46 +02:00
parent 20802ae0c9
commit e439bd3b43
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/database/Database.cpp
View File

@@ -79,7 +79,7 @@ Database::~Database()
m_idWorker->stop(); m_idWorker->stop();
delete m_idWorker; delete m_idWorker;
if ( m_workerRW ) if ( m_workerRW )
m_workerRW.data()->quit(); m_workerRW.data()->quit();
foreach ( QWeakPointer< DatabaseWorkerThread > workerThread, m_workerThreads ) foreach ( QWeakPointer< DatabaseWorkerThread > workerThread, m_workerThreads )
@@ -102,10 +102,10 @@ Database::~Database()
} }
} }
m_workerThreads.clear(); m_workerThreads.clear();
qDeleteAll( m_implHash.values() ); qDeleteAll( m_implHash.values() );
delete m_impl; delete m_impl;
} }
@@ -145,7 +145,7 @@ Database::enqueue( const QSharedPointer<DatabaseCommand>& lc )
for ( int i = 0; i < m_workerThreads.count(); i++ ) for ( int i = 0; i < m_workerThreads.count(); i++ )
{ {
workerThread = m_workerThreads.at( i ); workerThread = m_workerThreads.at( i );
if ( workerThread && workerThread.data()->worker() && !workerThread.data()->worker().data()->busy() ) if ( workerThread && workerThread.data()->worker() && !workerThread.data()->worker().data()->busy() )
{ {
happyWorker = workerThread.data()->worker(); happyWorker = workerThread.data()->worker();

1
src/libtomahawk/database/DatabaseImpl.cpp
View File

@@ -71,6 +71,7 @@ DatabaseImpl::DatabaseImpl( const QString& dbname )
// in case of unclean shutdown last time: // in case of unclean shutdown last time:
query.exec( "UPDATE source SET isonline = 'false'" ); query.exec( "UPDATE source SET isonline = 'false'" );
query.exec( "DELETE FROM oplog WHERE source IS NULL AND singleton = 'true'" );
m_fuzzyIndex = new FuzzyIndex( this, schemaUpdated ); m_fuzzyIndex = new FuzzyIndex( this, schemaUpdated );