--- a/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -15,7 +15,6 @@
*
*/
-
#include <AknNavi.h>
#include <AknNaviDe.h>
#include <AknNaviLabel.h>
@@ -410,7 +409,6 @@
TBool isFeed = EFalse;
TBool feedInFocus = EFalse;
- __ASSERT_DEBUG( (iCurrentFolder != NULL), Util::Panic( Util::EUninitializedData ));
if (iMoveActive || !iCurrentFolder)
{
@@ -650,9 +648,9 @@
TPtrC title;
// Set the view's title.
- if (iCurrentFolder != iRootFolder)
+ if (iCurrentFolder != NULL && iCurrentFolder != iRootFolder)
{
- if (iCurrentFolder->GetStringValue(EFeedAttributeTitle,title) != KErrNotFound && title.Length() != 0)
+ if (iCurrentFolder->GetStringValue(EFolderAttributeTitle,title) != KErrNotFound && title.Length() != 0)
{
iApiProvider.Display().SetTitleL(title);
}
@@ -2224,3 +2222,4 @@
// it to top and draws.
naviPane->PushL(*iNaviDecorator);
}
+