# HG changeset patch
# User Sebastian Brannstrom <sebastianb@symbian.org>
# Date 1287240098 -3600
# Node ID ed4ed5330d83edb32a61c2901264355a5a0f0512
# Parent  03e8cc4066baa46f1fd6850ae167662e79a5eb58# Parent  7ded71db88f603c7d97af7b5376cf501dd56a9f8
Merge symbian1 branch

diff -r 03e8cc4066ba -r ed4ed5330d83 engine/src/FeedEngine.cpp
--- a/engine/src/FeedEngine.cpp	Sat Oct 16 15:36:19 2010 +0100
+++ b/engine/src/FeedEngine.cpp	Sat Oct 16 15:41:38 2010 +0100
@@ -173,7 +173,7 @@
 	    }
 	//
 	iAutoUpdatedInitiator = aAutoUpdate;
-	if ((iFeedsUpdating.Count() > 0) || (isOfflineProfile)) // cancel update if in offline mode
+	if ((iFeedsUpdating.Count() > 0) || (isOfflineProfile && aAutoUpdate))
 		{
 		DP("Cancelling update");
 		iFeedClient->Stop();
@@ -299,6 +299,7 @@
 
 void CFeedEngine::NewShowL(CShowInfo& aItem)
 	{
+	DP1("NewShowL, aItem.Title()=", aItem.Title());
 	HBufC* description = HBufC::NewLC(KMaxDescriptionLength);
 	TPtr ptr(description->Des());
 	ptr.Copy(aItem.Description());