Merge pull request #13866 from unknownbrackets/rewind

SaveState: Allow rewind on mobile
hrydgard · Jan 3, 2021 · f0784de · f0784de
2 parents ac69d93 + fd7d8a7
commit f0784de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/Core/KeyMap.cpp b/Core/KeyMap.cpp
@@ -681,9 +681,9 @@ const KeyMap_IntStrPair psp_button_names[] = {
 	{VIRTKEY_PAUSE, "Pause"},
 #ifndef MOBILE_DEVICE
 	{VIRTKEY_FRAME_ADVANCE, "Frame Advance"},
-	{VIRTKEY_REWIND, "Rewind"},
 	{VIRTKEY_RECORD, "Audio/Video Recording" },
 #endif
+	{VIRTKEY_REWIND, "Rewind"},
 	{VIRTKEY_SAVE_STATE, "Save State"},
 	{VIRTKEY_LOAD_STATE, "Load State"},
 	{VIRTKEY_NEXT_SLOT,  "Next Slot"},

diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp
@@ -676,7 +676,6 @@ namespace SaveState
 		return false;
 	}
 
-#ifndef MOBILE_DEVICE
 	static inline void CheckRewindState()
 	{
 		if (gpuStats.numFlips % g_Config.iRewindFlipFrequency != 0)
@@ -689,10 +688,9 @@ namespace SaveState
 			return;
 
 		rewindLastTime = now;
-		DEBUG_LOG(BOOT, "saving rewind state");
+		DEBUG_LOG(BOOT, "Saving rewind state");
 		rewindStates.Save();
 	}
-#endif
 
 	bool HasLoadedState() {
 		return hasLoadedState;
@@ -719,10 +717,8 @@ namespace SaveState
 
 	void Process()
 	{
-#ifndef MOBILE_DEVICE
 		if (g_Config.iRewindFlipFrequency != 0 && gpuStats.numFlips != 0)
 			CheckRewindState();
-#endif
 
 		if (!needsProcess)
 			return;