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

Make sure account has been properly created.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-10-23 18:14:54 +02:00
parent 955be8d4b8
commit e0ceb9f85e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libtomahawk/accounts/AccountManager.cpp
View File

@@ -307,7 +307,8 @@ AccountManager::finishLoadingFromConfig( const QString& csid )
if ( m_accountFactories.contains( pluginFactory ) ) if ( m_accountFactories.contains( pluginFactory ) )
{ {
Account* account = loadPlugin( accountId ); Account* account = loadPlugin( accountId );
addAccount( account ); if ( account )
addAccount( account );
} }
} }
} }
@@ -336,10 +337,14 @@ AccountManager::loadPlugin( const QString& accountId )
QString factoryName = factoryFromId( accountId ); QString factoryName = factoryFromId( accountId );
Q_ASSERT( m_accountFactories.contains( factoryName ) ); Q_ASSERT( m_accountFactories.contains( factoryName ) );
if ( !m_accountFactories.contains( factoryName ) )
return 0;
Account* account = m_accountFactories[ factoryName ]->createAccount( accountId ); Account* account = m_accountFactories[ factoryName ]->createAccount( accountId );
hookupAccount( account ); if ( !account )
return 0;
hookupAccount( account );
return account; return account;
} }