summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameTools.cpp
diff options
context:
space:
mode:
authorMat M <mathew1800@gmail.com>2016-08-04 15:18:24 -0400
committerGitHub <noreply@github.com>2016-08-04 15:18:24 -0400
commitd6df861e8ebfffd31a7b498ea8e979e48ae143ed (patch)
treea6b294eae1ddf0cf9511829ac8ac6ce7bfe918d1 /Source/Core/DolphinWX/FrameTools.cpp
parente98875949c1fa70d3eb92ed0f618b7dd28048a2e (diff)
parent2bdc3ee777131d896d3b170855b61f1f4dab6fad (diff)
Merge pull request #4089 from RisingFog/remove_globals_saveslot
Remove Global Declarations from Frame
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index b3689e9ab5..b27a7a8de5 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -1673,9 +1673,9 @@ void CFrame::OnFrameSkip(wxCommandEvent& event)
void CFrame::OnSelectSlot(wxCommandEvent& event)
{
- g_saveSlot = event.GetId() - IDM_SELECT_SLOT_1 + 1;
- Core::DisplayMessage(StringFromFormat("Selected slot %d - %s", g_saveSlot,
- State::GetInfoStringOfSlot(g_saveSlot).c_str()),
+ m_saveSlot = event.GetId() - IDM_SELECT_SLOT_1 + 1;
+ Core::DisplayMessage(StringFromFormat("Selected slot %d - %s", m_saveSlot,
+ State::GetInfoStringOfSlot(m_saveSlot).c_str()),
2500);
}
@@ -1683,7 +1683,7 @@ void CFrame::OnLoadCurrentSlot(wxCommandEvent& event)
{
if (Core::IsRunningAndStarted())
{
- State::Load(g_saveSlot);
+ State::Load(m_saveSlot);
}
}
@@ -1691,7 +1691,7 @@ void CFrame::OnSaveCurrentSlot(wxCommandEvent& event)
{
if (Core::IsRunningAndStarted())
{
- State::Save(g_saveSlot);
+ State::Save(m_saveSlot);
}
}