From: kamesh <kamesh.kvss@samsung.com>
Date: Wed, 8 May 2013 10:21:10 +0000 (+0530)
Subject: IssueFix N_SE-37717
X-Git-Tag: submit/tizen_2.1/20130514.051144~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=815cb5fdceb257ae38bd360171fd93eb18225d78;p=apps%2Fosp%2FImageViewer.git

IssueFix N_SE-37717

Change-Id: I3cfebef82521facb8472f78f0ce45aeb5ccb9f9f
---

diff --git a/src/IvImageViewerForm.cpp b/src/IvImageViewerForm.cpp
index 057e8ae..5126fa1 100644
--- a/src/IvImageViewerForm.cpp
+++ b/src/IvImageViewerForm.cpp
@@ -468,6 +468,7 @@ ImageViewerForm::DeleteImageFile()
 {
 	AppLogDebug("ENTER");
 	int currentIndex = __pGallery->GetCurrentItemIndex();
+	int shuffleValue = 0;
 
 	String strItemText(EMPTY_SPACE);
 	String strItemIdxText(EMPTY_SPACE);
@@ -516,6 +517,21 @@ ImageViewerForm::DeleteImageFile()
 		__pGallery->SetCurrentItemIndex(--currentIndex);
 	}
 
+	if (__pPresentationModel->GetFileCount() > 1)
+	{
+		__pSettingPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER,
+				ENTRY_NAME_IMAGE_VIEWER_SHUFFLE_VALUE, shuffleValue);
+	}
+	if(shuffleValue != 0)
+	{
+		__shuffelStartIndex = __pGallery->GetCurrentItemIndex();
+		if(__pShuffledList != null)
+		{
+			delete __pShuffledList;
+			__pShuffledList = null;
+		}
+		CreateShuffledList(__pPresentationModel->GetFileCount());
+	}
 	__pGallery->UpdateGallery();
 	filePath = __pPresentationModel->GetFilePathAt(currentIndex);
 	__pPresentationModel->RequestImage(filePath);
@@ -1982,7 +1998,7 @@ ImageViewerForm::CreateShuffledList(int count)
 	}
 	origIndex = __shuffelStartIndex;
 
-	for(int i = count - 1; i > 1; --i)
+	for(int i = count - 1; i > 0; --i)
 	{
 		int randomNum = Math::Rand() % (i+1);
 		int shuffleIndex = __pShuffledList[randomNum];