--- a/application/src/PodcastQueueView.cpp	Sun Nov 14 13:05:37 2010 +0000
+++ b/application/src/PodcastQueueView.cpp	Tue Nov 16 10:26:34 2010 +0000
@@ -99,8 +99,10 @@
 
 CPodcastQueueView::~CPodcastQueueView()
 	{
+	DP("CPodcastQueueView::~CPodcastQueueView BEGIN");
 	iPodcastModel.ShowEngine().RemoveObserver(this);
 	iPodcastModel.FeedEngine().RemoveObserver(this);
+	DP("CPodcastQueueView::~CPodcastQueueView END");
 	}
 
 
@@ -303,7 +305,8 @@
 				}
 			
 			UpdateListboxItemsL();
-			iListContainer->Listbox()->SetCurrentItemIndex(index + 1);
+			if (index < iPodcastModel.ActiveShowList().Count() -1)
+				iListContainer->Listbox()->SetCurrentItemIndex(index + 1);
 			}
 			break;
 		case EPodcastSuspendDownloads:
@@ -328,7 +331,7 @@
 			}
 			break;
 		default:
-			CPodcastListView::HandleCommandL(aCommand);
+			CPodcastShowsView::HandleCommandL(aCommand);
 			break;
 		}
 	UpdateToolbar();