empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Save states: Saving/loading state to a specific slot should not change the current slot used by shortcut keys.

Browse source
This commit is contained in:
Souryo 2017-09-08 13:40:16 -04:00
parent 3a2897d534
commit e64e4731f2
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Core/EmulationSettings.h
View file

@ -289,6 +289,8 @@ enum class EmulatorShortcut
ToggleCheats, ToggleCheats,
ToggleAudio, ToggleAudio,
ToggleFastForward,
ToggleRewind,
RunSingleFrame, RunSingleFrame,
@ -347,9 +349,6 @@ enum class EmulatorShortcut
OpenMemoryTools, OpenMemoryTools,
OpenScriptWindow, OpenScriptWindow,
OpenTraceLogger, OpenTraceLogger,
ToggleFastForward,
ToggleRewind,
}; };
struct KeyCombination struct KeyCombination

2
Core/SaveStateManager.cpp
View file

@ -89,7 +89,6 @@ void SaveStateManager::SaveState(int stateIndex, bool displayMessage)
{ {
string filepath = SaveStateManager::GetStateFilepath(stateIndex); string filepath = SaveStateManager::GetStateFilepath(stateIndex);
if(SaveState(filepath)) { if(SaveState(filepath)) {
_lastIndex = stateIndex;
if(displayMessage) { if(displayMessage) {
MessageManager::DisplayMessage("SaveStates", "SaveStateSaved", std::to_string(stateIndex)); MessageManager::DisplayMessage("SaveStates", "SaveStateSaved", std::to_string(stateIndex));
} }
@ -173,7 +172,6 @@ bool SaveStateManager::LoadState(int stateIndex)
{ {
string filepath = SaveStateManager::GetStateFilepath(stateIndex); string filepath = SaveStateManager::GetStateFilepath(stateIndex);
if(LoadState(filepath, false)) { if(LoadState(filepath, false)) {
_lastIndex = stateIndex;
MessageManager::DisplayMessage("SaveStates", "SaveStateLoaded", std::to_string(stateIndex)); MessageManager::DisplayMessage("SaveStates", "SaveStateLoaded", std::to_string(stateIndex));
return true; return true;
} }

5
GUI.NET/InteropEmu.cs
View file

@ -1387,6 +1387,8 @@ namespace Mesen.GUI
ToggleCheats, ToggleCheats,
ToggleAudio, ToggleAudio,
ToggleFastForward,
ToggleRewind,
RunSingleFrame, RunSingleFrame,
@ -1445,9 +1447,6 @@ namespace Mesen.GUI
OpenMemoryTools, OpenMemoryTools,
OpenScriptWindow, OpenScriptWindow,
OpenTraceLogger, OpenTraceLogger,
ToggleFastForward,
ToggleRewind,
} }
public struct InteropCheatInfo public struct InteropCheatInfo