1 files changed, 11 insertions, 3 deletions
diff --git a/gui/LnxMain.c b/gui/LnxMain.c
index 14c295cd..67cb75ac 100755
--- a/gui/LnxMain.c
+++ b/gui/LnxMain.c
@@ -502,6 +502,8 @@ void SysClose() {
 	EmuShutdown();
 	ReleasePlugins();
 
+	CleanupMemSaveStates();
+
 	StopDebugger();
 
 	if (emuLog != NULL) fclose(emuLog);
@@ -573,11 +575,17 @@ static void SysDisableScreenSaver() {
 	}
 }
 
+u8 rew_timer = 0u; // TODO: change to scaled ms based or psxcycle based
 void SysUpdate() {
-	PADhandleKey(PAD1_keypressed());
-	PADhandleKey(PAD2_keypressed());
+	PADhandleKey(PAD1_keypressed() );
+	PADhandleKey(PAD2_keypressed() );
+
+	if (Config.RewindCount > 0 && rew_timer++ > 35) {
+		CreateRewindState();
+		rew_timer = 0;
+	}
 
-	SysDisableScreenSaver();
+	//SysDisableScreenSaver();
 }
 
 /* ADB TODO Replace RunGui() with StartGui ()*/