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

* Don't init ScanManager before local collection is set.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-09-14 17:57:19 +02:00
parent 8c3799f93d
commit e614f2ae42
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tomahawk/TomahawkApp.cpp
View File

@@ -222,8 +222,6 @@ TomahawkApp::init()
tDebug() << "Init Database."; tDebug() << "Init Database.";
initDatabase(); initDatabase();
m_scanManager = QPointer<ScanManager>( new ScanManager( this ) );
Pipeline::instance()->addExternalResolverFactory( boost::bind( &JSResolver::factory, _1, _2, _3 ) ); Pipeline::instance()->addExternalResolverFactory( boost::bind( &JSResolver::factory, _1, _2, _3 ) );
Pipeline::instance()->addExternalResolverFactory( boost::bind( &ScriptResolver::factory, _1, _2, _3 ) ); Pipeline::instance()->addExternalResolverFactory( boost::bind( &ScriptResolver::factory, _1, _2, _3 ) );
@@ -621,6 +619,12 @@ TomahawkApp::onInfoSystemReady()
tDebug() << "Init Pipeline."; tDebug() << "Init Pipeline.";
initPipeline(); initPipeline();
m_scanManager = QPointer<ScanManager>( new ScanManager( this ) );
if ( arguments().contains( "--filescan" ) )
{
m_scanManager.data()->runFullRescan();
}
// load remote list of resolvers able to be installed // load remote list of resolvers able to be installed
AtticaManager::instance(); AtticaManager::instance();
@@ -640,11 +644,6 @@ TomahawkApp::onInfoSystemReady()
m_scrobbler = new Scrobbler( this ); m_scrobbler = new Scrobbler( this );
#endif #endif
if ( arguments().contains( "--filescan" ) )
{
m_scanManager.data()->runFullRescan();
}
// Set up echonest catalog synchronizer // Set up echonest catalog synchronizer
Tomahawk::EchonestCatalogSynchronizer::instance(); Tomahawk::EchonestCatalogSynchronizer::instance();