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

Only install from attica when checking, even if we have checked + uninstalled

Browse Source
This commit is contained in:
Leo Franchi
2012-06-10 09:08:01 +02:00
parent 37d1c88b42
commit 99d84c6489
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libtomahawk/accounts/AccountModel.cpp
View File

@@ -416,6 +416,9 @@ AccountModel::setData( const QModelIndex& index, const QVariant& value, int role
if ( role == CheckboxClickedRole ) if ( role == CheckboxClickedRole )
{ {
Account* acct = 0; Account* acct = 0;
Qt::CheckState checkState = static_cast< Qt::CheckState >( value.toInt() );
switch ( node->type ) switch ( node->type )
{ {
case AccountModelNode::UniqueFactoryType: case AccountModelNode::UniqueFactoryType:
@@ -453,9 +456,11 @@ AccountModel::setData( const QModelIndex& index, const QVariant& value, int role
state = AtticaManager::Uninstalled; state = AtticaManager::Uninstalled;
} }
if ( state == AtticaManager::Installed ) // Don't install if we're unchecking. This happens if e.g. the user deletes his config file
// and opens tomahawk
if ( state == AtticaManager::Installed || checkState == Qt::Unchecked )
{ {
qDebug() << "Already installed with resolver, just enabling"; qDebug() << "Already installed with resolver, or unchecking, just enabling/disabling";
acct = node->atticaAccount; acct = node->atticaAccount;
break; break;
} }
@@ -491,13 +496,10 @@ AccountModel::setData( const QModelIndex& index, const QVariant& value, int role
if ( node->type == AccountModelNode::FactoryType ) if ( node->type == AccountModelNode::FactoryType )
{ {
// Turn on or off all accounts for this factory // Turn on or off all accounts for this factory\
Qt::CheckState state = static_cast< Qt::CheckState >( value.toInt() );
foreach ( Account* acct, node->accounts ) foreach ( Account* acct, node->accounts )
{ {
state == Qt::Checked ? AccountManager::instance()->enableAccount( acct ) checkState == Qt::Checked ? AccountManager::instance()->enableAccount( acct )
: AccountManager::instance()->disableAccount( acct ); : AccountManager::instance()->disableAccount( acct );
} }