From: rashmi udaya <rashmi.uday@samsung.com>
Date: Thu, 11 Jul 2013 07:04:49 +0000 (+0530)
Subject: For NSE_45763
X-Git-Tag: submit/tizen_2.2/20130714.134410~1
X-Git-Url: http://review.tizen.org/git/?p=apps%2Fosp%2FGallery.git;a=commitdiff_plain;h=63a4c7972f169227dc7652bd7fdf8022d89e4df5

For NSE_45763

Change-Id: I9240aa774e12d2d21dba585331894a411a9caf31
---

diff --git a/src/GlAlbumListPresentationModel.cpp b/src/GlAlbumListPresentationModel.cpp
index 8a02e3c..7e8b035 100644
--- a/src/GlAlbumListPresentationModel.cpp
+++ b/src/GlAlbumListPresentationModel.cpp
@@ -731,6 +731,7 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 				if (pAlbumInfo != null && pAlbumInfo->GetContentIdCount() > 0)
 				{
 					__pAlbumInfoList->Add(pAlbumInfo);
+					AppLog("Adding album");
 				}
 				else
 				{
@@ -743,7 +744,7 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 		int insertIndex = 0;
 		if (pAllAlbumInfo->GetContentIdCount() > 0)
 		{
-			__pAlbumInfoList->InsertAt((Object&)*pAllAlbumInfo, ++insertIndex);
+			__pAlbumInfoList->InsertAt((Object&)*pAllAlbumInfo, insertIndex++);
 		}
 		else
 		{
@@ -752,7 +753,7 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 
 		if (pCameraAlbumInfo->GetContentIdCount() > 0)
 		{
-			__pAlbumInfoList->InsertAt((Object&)*pCameraAlbumInfo, ++insertIndex);
+			__pAlbumInfoList->InsertAt((Object&)*pCameraAlbumInfo, insertIndex++);
 		}
 		else
 		{
@@ -761,7 +762,7 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 
 		if (pDownloadAlbumInfo->GetContentIdCount() > 0)
 		{
-			__pAlbumInfoList->InsertAt((Object&)*pDownloadAlbumInfo, ++insertIndex);
+			__pAlbumInfoList->InsertAt((Object&)*pDownloadAlbumInfo, insertIndex++);
 		}
 		else
 		{
@@ -770,7 +771,7 @@ AlbumListPresentationModel::InitializeAlbumInfoList(const ContentType& contentTy
 
 		if (pNoNameAlbumInfo->GetContentIdCount() > 0)
 		{
-			__pAlbumInfoList->InsertAt((Object&)*pNoNameAlbumInfo, ++insertIndex);
+			__pAlbumInfoList->InsertAt((Object&)*pNoNameAlbumInfo, insertIndex++);
 		}
 		else
 		{
diff --git a/src/GlTimerBase.cpp b/src/GlTimerBase.cpp
index 4fecce7..5891c6e 100644
--- a/src/GlTimerBase.cpp
+++ b/src/GlTimerBase.cpp
@@ -108,12 +108,6 @@ GlTimerBase::OnTimerExpired(Timer& timer)
 			if (__pContentIdList->GetAt(__moveToCount) != null)
 			{
 				result r = TimerExpired(__pContentIdList->GetAt(__moveToCount));
-				if (IsFailed(r))
-				{
-					AppLogDebug("OnTimerExpired EXIT(%s)", GetErrorMessage(r));
-					OnOpCancelled(CANCEL_SYS_ERROR);
-					return;
-				}
 			}
 			++__moveToCount;
 			__pMoveProBar->IncProgress(__moveToCount);