diff --git a/Source/Core/DolphinWX/MemcardManager.cpp b/Source/Core/DolphinWX/MemcardManager.cpp index faf79a6d5a..3ac86e860c 100644 --- a/Source/Core/DolphinWX/MemcardManager.cpp +++ b/Source/Core/DolphinWX/MemcardManager.cpp @@ -809,7 +809,7 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event) popupMenu.Append(ID_SAVEEXPORT_A + slot, _("Export Save")); popupMenu.Append(ID_EXPORTALL_A + slot, _("Export all saves")); - popupMenu.FindItem(ID_COPYFROM_A + slot)->Enable(__mcmSettings.twoCardsLoaded); + popupMenu.FindItem(ID_COPYFROM_A + slot)->Enable(mgr_settings.twoCardsLoaded); popupMenu.AppendSeparator(); @@ -820,9 +820,9 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event) wxString::Format(_("Set as default Memory Card %c"), 'A' + slot)); popupMenu.AppendCheckItem(ID_USEPAGES, _("Enable pages")); - popupMenu.FindItem(ID_PREVPAGE_A + slot)->Enable(prevPage && __mcmSettings.usePages); - popupMenu.FindItem(ID_NEXTPAGE_A + slot)->Enable(nextPage && __mcmSettings.usePages); - popupMenu.FindItem(ID_USEPAGES)->Check(__mcmSettings.usePages); + popupMenu.FindItem(ID_PREVPAGE_A + slot)->Enable(prevPage && mgr_settings.usePages); + popupMenu.FindItem(ID_NEXTPAGE_A + slot)->Enable(nextPage && mgr_settings.usePages); + popupMenu.FindItem(ID_USEPAGES)->Check(mgr_settings.usePages); popupMenu.AppendSeparator(); @@ -836,7 +836,7 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event) // for (int i = COLUMN_BANNER; i <= COLUMN_FIRSTBLOCK; i++) for (int i = COLUMN_TITLE; i <= COLUMN_FIRSTBLOCK; i++) { - popupMenu.FindItem(i)->Check(__mcmSettings.column[i]); + popupMenu.FindItem(i)->Check(mgr_settings.column[i]); } } PopupMenu(&popupMenu); diff --git a/Source/Core/DolphinWX/MemcardManager.h b/Source/Core/DolphinWX/MemcardManager.h index da5aa23f44..358f34a19e 100644 --- a/Source/Core/DolphinWX/MemcardManager.h +++ b/Source/Core/DolphinWX/MemcardManager.h @@ -108,7 +108,7 @@ private: bool LoadSettings(); bool SaveSettings(); - struct _mcmSettings + struct ManagerSettings { bool twoCardsLoaded; bool usePages; @@ -119,13 +119,13 @@ private: { public: CMemcardListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, _mcmSettings& _mcmSetngs) - : wxListCtrl(parent, id, pos, size, style), __mcmSettings(_mcmSetngs) + long style, ManagerSettings& manager_settings) + : wxListCtrl(parent, id, pos, size, style), mgr_settings(manager_settings) { Bind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this); } ~CMemcardListCtrl() { Unbind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this); } - _mcmSettings& __mcmSettings; + ManagerSettings& mgr_settings; bool prevPage; bool nextPage;