# HG changeset patch # User Sebastian Brannstrom # Date 1290431487 0 # Node ID 5f24605de6cfe65992934a2036db82b1cdacdf22 # Parent 422f96ee667295713442a3442c6ab5cf48fc3271 Added query when marking all played in shows view; Fix for auto delete diff -r 422f96ee6672 -r 5f24605de6cf application/src/PodcastShowsView.cpp --- a/application/src/PodcastShowsView.cpp Mon Nov 22 00:32:23 2010 +0000 +++ b/application/src/PodcastShowsView.cpp Mon Nov 22 13:11:27 2010 +0000 @@ -648,14 +648,12 @@ break; case EPodcastMarkAllPlayed: { - if (iShowNewShows) { - TBuf msg; - iEikonEnv->ReadResourceL(msg, R_MARK_ALL_OLD_QUERY); - if (!ShowQueryMessageL(msg)) - { - break; - } - } + TBuf msg; + iEikonEnv->ReadResourceL(msg, R_MARK_ALL_OLD_QUERY); + if (!ShowQueryMessageL(msg)) + { + break; + } iPodcastModel.MarkSelectionPlayedL(); UpdateListboxItemsL(); } @@ -836,7 +834,7 @@ { CShowInfo *info = iPodcastModel.ActiveShowList()[index]; info->SetPlayState(aPlayed ? EPlayed : ENeverPlayed); - if (aPlayed) + if (aPlayed && info->DownloadState() == EDownloaded) { // PostPlayHandling calls UpdateShow, which is slow, so we don't need to do it again iPodcastModel.ShowEngine().PostPlayHandling(info); diff -r 422f96ee6672 -r 5f24605de6cf engine/src/ShowEngine.cpp --- a/engine/src/ShowEngine.cpp Mon Nov 22 00:32:23 2010 +0000 +++ b/engine/src/ShowEngine.cpp Mon Nov 22 13:11:27 2010 +0000 @@ -1718,6 +1718,7 @@ deleteDate.HomeTime(); deleteDate += daysAhead; aShow->SetDeleteDate(deleteDate); + DP2("Setting show %S to be deleted on the %d th", &aShow->Title(), deleteDate.DayNoInMonth()+1); } UpdateShowL(*aShow);