From fc0b79ec2f7ea18daa6d6fdffba4630ac4702c7c Mon Sep 17 00:00:00 2001
From: Brandon Wright <bearoso@gmail.com>
Date: Wed, 20 Jun 2018 12:44:09 -0500
Subject: [PATCH] Save oops unconditionally on loading state. GTK+: Use oops
 for undo load state.

---
 gtk/src/gtk_file.cpp      |  8 --------
 gtk/src/gtk_s9xwindow.cpp |  2 +-
 snapshot.cpp              | 11 ++++++-----
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/gtk/src/gtk_file.cpp b/gtk/src/gtk_file.cpp
index 57e16b1b..85323f1f 100644
--- a/gtk/src/gtk_file.cpp
+++ b/gtk/src/gtk_file.cpp
@@ -385,8 +385,6 @@ S9xAutoSaveSRAM (void)
 void
 S9xLoadState (const char *filename)
 {
-    S9xFreezeGame (S9xGetFilename (".undo", SNAPSHOT_DIR));
-
     if (S9xUnfreezeGame (filename))
     {
         sprintf (buf, "%s loaded", filename);
@@ -530,9 +528,6 @@ S9xQuickLoadSlot (int slot)
              S9xGetDirectory (SNAPSHOT_DIR), SLASH_STR, def,
              slot);
 
-    if (file_exists (filename))
-        S9xFreezeGame (S9xGetFilename (".undo", SNAPSHOT_DIR));
-
     if (S9xUnfreezeGame (filename))
     {
         snprintf (buf, PATH_MAX, "%s.%03d loaded", def, slot);
@@ -548,9 +543,6 @@ S9xQuickLoadSlot (int slot)
               S9xGetDirectory (SNAPSHOT_DIR), SLASH_STR,
               def, digits[slot]);
 
-    if (file_exists (filename))
-        S9xFreezeGame (S9xGetFilename (".undo", SNAPSHOT_DIR));
-
     if (S9xUnfreezeGame (filename))
     {
         snprintf (buf, PATH_MAX,
diff --git a/gtk/src/gtk_s9xwindow.cpp b/gtk/src/gtk_s9xwindow.cpp
index f464acf5..3722268f 100644
--- a/gtk/src/gtk_s9xwindow.cpp
+++ b/gtk/src/gtk_s9xwindow.cpp
@@ -463,7 +463,7 @@ event_load_state (GtkWidget *widget, gpointer data)
 static void
 event_load_state_undo (GtkWidget *widget, gpointer data)
 {
-    S9xUnfreezeGame (S9xGetFilename (".undo", SNAPSHOT_DIR));
+    S9xUnfreezeGame (S9xGetFilename (".oops", SNAPSHOT_DIR));
 
     return;
 }
diff --git a/snapshot.cpp b/snapshot.cpp
index 468cf781..0232185f 100644
--- a/snapshot.cpp
+++ b/snapshot.cpp
@@ -1182,12 +1182,11 @@ static void UnfreezeStructFromCopy (void *, FreezeData *, int, uint8 *, int);
 static void FreezeBlock (STREAM, const char *, uint8 *, int);
 static void FreezeStruct (STREAM, const char *, void *, FreezeData *, int);
 
+static time_t	oops_timer = -1;
 
 void S9xResetSaveTimer (bool8 dontsave)
 {
-	static time_t	t = -1;
-
-	if (!Settings.DontSaveOopsSnapshot && !dontsave && t != -1 && time(NULL) - t > 300)
+	if (!Settings.DontSaveOopsSnapshot && !dontsave && oops_timer != -1 && time(NULL) - oops_timer > 300)
 	{
 		char	filename[PATH_MAX + 1];
 		char	drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], def[_MAX_FNAME + 1], ext[_MAX_EXT + 1];
@@ -1198,7 +1197,7 @@ void S9xResetSaveTimer (bool8 dontsave)
 		S9xFreezeGame(filename);
 	}
 
-	t = time(NULL);
+	oops_timer = time(NULL);
 }
 
 uint32 S9xFreezeSize()
@@ -1257,12 +1256,14 @@ bool8 S9xUnfreezeGame (const char *filename)
 	const char	*base = S9xBasename(filename);
 
 	_splitpath(filename, drive, dir, def, ext);
-	S9xResetSaveTimer(!strcmp(ext, "oops") || !strcmp(ext, "oop") || !strcmp(ext, ".oops") || !strcmp(ext, ".oop"));
 
 	if (S9xOpenSnapshotFile(filename, TRUE, &stream))
 	{
 		int	result;
 
+		oops_timer = 0;
+		S9xResetSaveTimer(!strcmp(ext, "oops") || !strcmp(ext, "oop") || !strcmp(ext, ".oops") || !strcmp(ext, ".oop"));
+
 		result = S9xUnfreezeFromStream(stream);
 		S9xCloseSnapshotFile(stream);