From 965cf876c3dd1eb4d9964bbc5519cecc8b588055 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Thu, 17 Feb 2011 22:13:58 -0500 Subject: [PATCH] fix stopping completely on track error fix logic error introduced in last commit --- .../playlist/dynamic/echonest/EchonestGenerator.cpp | 4 ++-- src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp index a89090428..f80c9132f 100644 --- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp +++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp @@ -244,9 +244,9 @@ EchonestGenerator::onlyThisArtistType( Echonest::DynamicPlaylist::ArtistTypeEnum bool some = false; foreach( const dyncontrol_ptr& control, m_controls ) { - if( control->selectedType() == "Artist" || control->selectedType() == "Artist Description" && static_cast( control->match().toInt() ) != type ) { + if( ( control->selectedType() == "Artist" || control->selectedType() == "Artist Description" ) && static_cast( control->match().toInt() ) != type ) { only = false; - } else if( control->selectedType() == "Artist" || control->selectedType() == "Artist Description" && static_cast( control->match().toInt() ) == type ) { + } else if( ( control->selectedType() == "Artist" || control->selectedType() == "Artist Description" ) && static_cast( control->match().toInt() ) == type ) { some = true; } } diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp index c1f577af5..5f74ca866 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp @@ -233,9 +233,7 @@ DynamicWidget::stationFailed( const QString& msg ) { m_view->showMessage( msg ); - if( m_runningOnDemand ) { - stopStation( false ); - } + stopStation( false ); }