From 5712a74ffd30b2b3e582f864ff6a6e48a06ab024 Mon Sep 17 00:00:00 2001
From: LPFaint99 <lpfaint99@gmail.com>
Date: Sat, 6 Dec 2008 09:29:44 +0000
Subject: [PATCH] Fix for memcard manager, now exporting and copying, deleting
 saves on pages other than page one will work correctly

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1412 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DolphinWX/Src/MemcardManager.cpp | 35 +++++++++++---------
 Source/Core/DolphinWX/Src/MemcardManager.h   |  6 ++--
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp
index 0446ec284c..cbed087842 100644
--- a/Source/Core/DolphinWX/Src/MemcardManager.cpp
+++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp
@@ -236,7 +236,7 @@ void CMemcardManager::OnPathChange(wxFileDirPickerEvent& event)
 	switch (event.GetId())
 	{
 	case ID_MEMCARD1PATH:
-		page1 = 0;
+		page0 = 0;
 		if (m_Memcard1PrevPage->IsEnabled()) m_Memcard1PrevPage->Disable();
 		if (!strcasecmp(m_Memcard1Path->GetPath().mb_str(),m_Memcard2Path->GetPath().mb_str()))
 		{
@@ -245,7 +245,7 @@ void CMemcardManager::OnPathChange(wxFileDirPickerEvent& event)
 			m_MemcardList[0]->ClearAll();
 			t_StatusLeft->SetLabel(wxEmptyString);
 		}
-		else if (ReloadMemcard(event.GetPath().mb_str(), 0, page1))
+		else if (ReloadMemcard(event.GetPath().mb_str(), 0, page0))
 		{
 			m_FixChecksumLeft->Enable();
 			m_SaveImportLeft->Enable();
@@ -264,13 +264,13 @@ void CMemcardManager::OnPathChange(wxFileDirPickerEvent& event)
 		m_Memcard1NextPage->Disable();
 		break;
 	case ID_MEMCARD2PATH:
-		page2 = 0;
+		page1 = 0;
 		if (m_Memcard2PrevPage->IsEnabled()) m_Memcard2PrevPage->Disable();
 		if (!strcasecmp(m_Memcard1Path->GetPath().mb_str(),m_Memcard2Path->GetPath().mb_str()))
 		{
 			wxMessageBox(wxT("Memcard already opened"), wxT("Error"), wxOK|wxICON_ERROR);
 		}
-		else if (ReloadMemcard(event.GetPath().mb_str(), 1, page2))
+		else if (ReloadMemcard(event.GetPath().mb_str(), 1, page1))
 		{
 			m_FixChecksumRight->Enable();
 			m_SaveImportRight->Enable();
@@ -308,28 +308,28 @@ void CMemcardManager::OnPageChange(wxCommandEvent& event)
 	case ID_MEMCARD1NEXTPAGE:
 		if (!m_Memcard1PrevPage->IsEnabled()) m_Memcard1PrevPage->Enable();
 		if (!m_Memcard1NextPage->IsEnabled()) m_Memcard1NextPage->Enable();
-		page1++;		
-		if (page1 == 7) m_Memcard1NextPage->Disable();
-		ReloadMemcard(m_Memcard1Path->GetPath().mb_str(), 0, page1);
+		page0++;		
+		if (page0 == MAXPAGES) m_Memcard1NextPage->Disable();
+		ReloadMemcard(m_Memcard1Path->GetPath().mb_str(), 0, page0);
 		break;
 	case ID_MEMCARD2NEXTPAGE:
 		if (!m_Memcard2PrevPage->IsEnabled()) m_Memcard2PrevPage->Enable();
 		if (!m_Memcard2NextPage->IsEnabled()) m_Memcard2NextPage->Enable();
-		page2++;		
-		if (page2 == 7) m_Memcard2NextPage->Disable();
-		ReloadMemcard(m_Memcard2Path->GetPath().mb_str(), 1, page2);
+		page1++;		
+		if (page1 == MAXPAGES) m_Memcard2NextPage->Disable();
+		ReloadMemcard(m_Memcard2Path->GetPath().mb_str(), 1, page1);
 		break;
 	case ID_MEMCARD1PREVPAGE:
 		if (!m_Memcard1NextPage->IsEnabled()) m_Memcard1NextPage->Enable();
-		page1--;		
-		if (page1 == 0) m_Memcard1PrevPage->Disable();
-		ReloadMemcard(m_Memcard1Path->GetPath().mb_str(), 0, page1);
+		page0--;		
+		if (!page0) m_Memcard1PrevPage->Disable();
+		ReloadMemcard(m_Memcard1Path->GetPath().mb_str(), 0, page0);
 		break;
 	case ID_MEMCARD2PREVPAGE:
 		if (!m_Memcard2NextPage->IsEnabled()) m_Memcard2NextPage->Enable();
-		page2--;		
-		if (page2 == 0) m_Memcard2PrevPage->Disable();
-		ReloadMemcard(m_Memcard2Path->GetPath().mb_str(), 1, page2);
+		page1--;		
+		if (!page1) m_Memcard2PrevPage->Disable();
+		ReloadMemcard(m_Memcard2Path->GetPath().mb_str(), 1, page1);
 		break;
 	}
 }
@@ -343,6 +343,9 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
 	std::string fileName2("");
 	wxString blocksOpen;
 
+	if (index0 != -1 && page0) index0 += ITEMSPERPAGE * page0;
+	if (index1 != -1 && page1) index1 += ITEMSPERPAGE * page1;
+
 	switch (event.GetId())
 	{
 	case ID_COPYTOLEFT:
diff --git a/Source/Core/DolphinWX/Src/MemcardManager.h b/Source/Core/DolphinWX/Src/MemcardManager.h
index 7e8f8813a8..2b864bf5d0 100644
--- a/Source/Core/DolphinWX/Src/MemcardManager.h
+++ b/Source/Core/DolphinWX/Src/MemcardManager.h
@@ -28,6 +28,8 @@
 #include "MemoryCards/GCMemcard.h"
 #undef MEMCARD_MANAGER_STYLE
 #define MEMCARD_MANAGER_STYLE wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX | wxRESIZE_BORDER | wxMAXIMIZE_BOX
+#define ITEMSPERPAGE 16
+#define MAXPAGES (128 / ITEMSPERPAGE) - 1
 
 class CMemcardManager
 	: public wxDialog
@@ -41,8 +43,8 @@ class CMemcardManager
 
 		DECLARE_EVENT_TABLE();
 
-		int page1,
-			page2;
+		int page0,
+			page1;
 
 		wxBoxSizer *sMain;
 		wxBoxSizer *sPagesLeft;