--- a/application/src/PodcastFeedView.cpp	Thu Mar 11 21:45:01 2010 +0000
+++ b/application/src/PodcastFeedView.cpp	Fri Mar 12 00:20:10 2010 +0000
@@ -175,28 +175,19 @@
 	                                  const TDesC8& aCustomMessage)
 	{
 	CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage);
-
+	if (iFirstActivateAfterLaunch)
+		{
+		iFirstActivateAfterLaunch = EFalse;
+		}
+	
 	if (aPrevViewId.iViewUid == KUidPodcastShowsViewID)
 		{
 		// back key from shows view
 		iViewingShows = EFalse;
 		}
 	
-	if (iViewingShows)
-		{
-		// go to shows view
-		AppUi()->ActivateLocalViewL(KUidPodcastShowsViewID,  TUid::Uid(0), KNullDesC8());
-		} 
-	else 
-		{
-		UpdateListboxItemsL();		
-		UpdateToolbar();
-
-		if (iFirstActivateAfterLaunch)
-			{
-			iFirstActivateAfterLaunch = EFalse;
-			}
-		}
+	UpdateListboxItemsL();		
+	UpdateToolbar();
 	}
 
 void CPodcastFeedView::DoDeactivate()
@@ -988,3 +979,8 @@
     }
 	DP("CPodcastListView::HandleLongTapEventL END");
 }
+
+TBool CPodcastFeedView::ViewingShows()
+	{
+	return iViewingShows;
+	}