# HG changeset patch
# User teknolog
# Date 1273613255 -3600
# Node ID f4b512d870e8e7ea8385b227fa96757fd46942a0
# Parent  f0de05da6d651e1daf6d70e1a36b76dc41cace27
Moved call to DeleteOldShowsByFeedL to when a feed is listed. This prevents a race condition which likely caused

diff -r f0de05da6d65 -r f4b512d870e8 application/inc/buildno.h
--- a/application/inc/buildno.h	Tue May 11 21:41:14 2010 +0100
+++ b/application/inc/buildno.h	Tue May 11 22:27:35 2010 +0100
@@ -1,2 +1,2 @@
 // Build number generated by increment_buildno.py, do not edit manually

-#define BUILD_NO 21
\ No newline at end of file
+#define BUILD_NO 22
\ No newline at end of file
diff -r f0de05da6d65 -r f4b512d870e8 application/sis/buildno.txt
--- a/application/sis/buildno.txt	Tue May 11 21:41:14 2010 +0100
+++ b/application/sis/buildno.txt	Tue May 11 22:27:35 2010 +0100
@@ -1,1 +1,1 @@
-21
\ No newline at end of file
+22
\ No newline at end of file
diff -r f0de05da6d65 -r f4b512d870e8 application/sis/podcatcher_udeb.pkg
--- a/application/sis/podcatcher_udeb.pkg	Tue May 11 21:41:14 2010 +0100
+++ b/application/sis/podcatcher_udeb.pkg	Tue May 11 22:27:35 2010 +0100
@@ -1,7 +1,7 @@
 &EN
 :"Symbian Foundation"
 %{"Podcatcher"}
-#{"Podcatcher"},(0xA0009D00), 1, 00, 21, TYPE=SA
+#{"Podcatcher"},(0xA0009D00), 1, 00, 22, TYPE=SA
 
 ;Supports S60 3rd edition
 [0x101F7961], 0, 0, 0, {"Series60ProductID"}
diff -r f0de05da6d65 -r f4b512d870e8 application/sis/podcatcher_udeb.sis
Binary file application/sis/podcatcher_udeb.sis has changed
diff -r f0de05da6d65 -r f4b512d870e8 application/sis/podcatcher_udeb_signed.sis
Binary file application/sis/podcatcher_udeb_signed.sis has changed
diff -r f0de05da6d65 -r f4b512d870e8 application/sis/podcatcher_urel.pkg
--- a/application/sis/podcatcher_urel.pkg	Tue May 11 21:41:14 2010 +0100
+++ b/application/sis/podcatcher_urel.pkg	Tue May 11 22:27:35 2010 +0100
@@ -1,7 +1,7 @@
 &EN
 :"Symbian Foundation"
 %{"Podcatcher"}
-#{"Podcatcher"},(0xA0009D00), 1, 00, 21, TYPE=SA
+#{"Podcatcher"},(0xA0009D00), 1, 00, 22, TYPE=SA
 
 ;Supports S60 3rd edition
 [0x101F7961], 0, 0, 0, {"Series60ProductID"}
diff -r f0de05da6d65 -r f4b512d870e8 engine/src/FeedEngine.cpp
--- a/engine/src/FeedEngine.cpp	Tue May 11 21:41:14 2010 +0100
+++ b/engine/src/FeedEngine.cpp	Tue May 11 22:27:35 2010 +0100
@@ -592,11 +592,7 @@
 							iActiveFeed->SetLastError(parserErr);
 							DP1("CFeedEngine::Complete()\t Failed to parse feed. Leave with error code=%d", parserErr);
 							}
-						else
-							{
-							iPodcastModel.ShowEngine().DeleteOldShowsByFeedL(iActiveFeed->Uid());
-							}
-	
+
 						// delete the downloaded XML file as it is no longer needed
 						BaflUtils::DeleteFile(iPodcastModel.FsSession(),iUpdatingFeedFileName);			
 	
diff -r f0de05da6d65 -r f4b512d870e8 engine/src/FeedParser.cpp
--- a/engine/src/FeedParser.cpp	Tue May 11 21:41:14 2010 +0100
+++ b/engine/src/FeedParser.cpp	Tue May 11 22:27:35 2010 +0100
@@ -281,8 +281,8 @@
 				iActiveShow = NULL;
 				
 				iItemsParsed++;
-				//DP2("iItemsParsed: %d, iMaxItems: %d", iItemsParsed, iMaxItems);
-				if (iItemsParsed > iMaxItems) 
+				DP2("iItemsParsed: %d, iMaxItems: %d", iItemsParsed, iMaxItems);
+				if (iItemsParsed >= iMaxItems) 
 					{
 					iStoppedParsing = ETrue;
 					DP("*** Too many items, aborting parsing");
diff -r f0de05da6d65 -r f4b512d870e8 engine/src/PodcastModel.cpp
--- a/engine/src/PodcastModel.cpp	Tue May 11 21:41:14 2010 +0100
+++ b/engine/src/PodcastModel.cpp	Tue May 11 22:27:35 2010 +0100
@@ -435,6 +435,7 @@
 EXPORT_C void CPodcastModel::GetShowsByFeedL(TUint aFeedUid)
 	{
 	iActiveShowList.ResetAndDestroy();
+	iShowEngine->DeleteOldShowsByFeedL(aFeedUid);
 	iShowEngine->CheckForDeletedShows(aFeedUid);
 	iShowEngine->GetShowsByFeedL(iActiveShowList, aFeedUid);
 	}