From b4b55289d6aad3dc057e89402db79d08d8fc9853 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Mon, 25 May 2015 04:40:02 +0200 Subject: [PATCH] FolderMemoryCard: Remember filter so it can be reapplied when memory cards are changed while game is running. --- pcsx2/gui/MemoryCardFolder.cpp | 3 ++- pcsx2/gui/MemoryCardFolder.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pcsx2/gui/MemoryCardFolder.cpp b/pcsx2/gui/MemoryCardFolder.cpp index ec7cc49eef..c1da434359 100644 --- a/pcsx2/gui/MemoryCardFolder.cpp +++ b/pcsx2/gui/MemoryCardFolder.cpp @@ -1025,7 +1025,7 @@ FolderMemoryCardAggregator::FolderMemoryCardAggregator() { void FolderMemoryCardAggregator::Open() { for ( int i = 0; i < totalCardSlots; ++i ) { - m_cards[i].Open(); + m_cards[i].Open( m_lastKnownFilter ); } } @@ -1071,5 +1071,6 @@ void FolderMemoryCardAggregator::ReIndex( uint slot, const wxString& filter ) { m_cards[slot].Close(); Console.WriteLn( Color_Green, L"(FolderMcd) Re-Indexing slot %u with filter \"%s\"", slot, WX_STR( filter ) ); m_cards[slot].Open( filter ); + m_lastKnownFilter = filter; } diff --git a/pcsx2/gui/MemoryCardFolder.h b/pcsx2/gui/MemoryCardFolder.h index 8df9aff6c6..1352d9566f 100644 --- a/pcsx2/gui/MemoryCardFolder.h +++ b/pcsx2/gui/MemoryCardFolder.h @@ -298,6 +298,7 @@ class FolderMemoryCardAggregator { protected: static const int totalCardSlots = 8; FolderMemoryCard m_cards[totalCardSlots]; + wxString m_lastKnownFilter = L""; public: FolderMemoryCardAggregator();