--- a/application/src/PodcastAppui.cpp	Fri Jul 02 15:57:01 2010 +0100
+++ b/application/src/PodcastAppui.cpp	Mon Jul 05 12:32:22 2010 +0100
@@ -329,21 +329,22 @@
 
 void CPodcastAppUi::ConnectionSelectionStart()
 	{
-	DP("CPodcastAppUi::ConnectionSelectionStart()");
+	DP("CPodcastAppUi::ConnectionSelectionStart() BEGIN");
 	iFeedView->UpdateToolbar(EFalse);
 	iShowsView->UpdateToolbar(EFalse);
 	iQueueView->UpdateToolbar(EFalse);
 	iSearchView->UpdateToolbar(EFalse);
+	DP("CPodcastAppUi::ConnectionSelectionStart() END");
 	}
 
 void CPodcastAppUi::ConnectionSelectionEnd()
 	{
-	DP("CPodcastAppUi::ConnectionSelectionEnd()");
-	iFeedView->UpdateToolbar(ETrue);
+	DP("CPodcastAppUi::ConnectionSelectionEnd() BEGIN");
 	iFeedView->UpdateToolbar(ETrue);
 	iShowsView->UpdateToolbar(ETrue);
 	iQueueView->UpdateToolbar(ETrue);
 	iSearchView->UpdateToolbar(ETrue);
+	DP("CPodcastAppUi::ConnectionSelectionEnd() END");
 	}
 
 void CPodcastAppUi::GetErrorTextL(TDes &aErrorMessage, TInt aErrorCode)

--- a/application/src/PodcastShowsView.cpp	Fri Jul 02 15:57:01 2010 +0100
+++ b/application/src/PodcastShowsView.cpp	Mon Jul 05 12:32:22 2010 +0100
@@ -690,7 +690,7 @@
 			toolbar->SetToolbarVisibility(aVisible);
 		}
 	
-		TBool updatingState = iPodcastModel.FeedEngine().ClientState() != EIdle && 
+		TBool updatingState = iPodcastModel.FeedEngine().ClientState() != EIdle && iPodcastModel.ActiveFeedInfo() && 
 				iPodcastModel.FeedEngine().ActiveClientUid() == iPodcastModel.ActiveFeedInfo()->Uid();
 	
 		toolbar->HideItem(EPodcastUpdateFeed, updatingState, ETrue );