diff options
| author | Mat M <mathew1800@gmail.com> | 2016-08-04 15:18:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-04 15:18:24 -0400 |
| commit | d6df861e8ebfffd31a7b498ea8e979e48ae143ed (patch) | |
| tree | a6b294eae1ddf0cf9511829ac8ac6ce7bfe918d1 /Source/Core/DolphinWX/Frame.cpp | |
| parent | e98875949c1fa70d3eb92ed0f618b7dd28048a2e (diff) | |
| parent | 2bdc3ee777131d896d3b170855b61f1f4dab6fad (diff) | |
Merge pull request #4089 from RisingFog/remove_globals_saveslot
Remove Global Declarations from Frame
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index e918db9b59..28ef4c1386 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -66,8 +66,6 @@ #include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoConfig.h" -int g_saveSlot = 1; - #if defined(HAVE_X11) && HAVE_X11 // X11Utils nastiness that's only used here namespace X11Utils @@ -1528,11 +1526,11 @@ void CFrame::ParseHotkeys() } if (IsHotkey(HK_SAVE_STATE_SLOT_SELECTED)) { - State::Save(g_saveSlot); + State::Save(m_saveSlot); } if (IsHotkey(HK_LOAD_STATE_SLOT_SELECTED)) { - State::Load(g_saveSlot); + State::Load(m_saveSlot); } if (IsHotkey(HK_TOGGLE_STEREO_SBS)) |