From 8c5238c34927abc5ec4dcb88f1fcc4ec24b39838 Mon Sep 17 00:00:00 2001
From: Arzed Five <rz5@users.noreply.github.com>
Date: Wed, 8 Jun 2016 23:03:49 +0100
Subject: [PATCH] Undo Load State and Undo Save State both seem to be working.

---
 command.c               |   4 ++--
 internal buffer         | Bin 0 -> 83988 bytes
 intl/msg_hash_us.c      |  10 +++++-----
 msg_hash.h              |   4 ++--
 tasks/task_save_state.c |  25 ++++++++++++++++---------
 5 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 internal buffer

diff --git a/command.c b/command.c
index 3a69e11525..63e5ff9d90 100644
--- a/command.c
+++ b/command.c
@@ -1600,7 +1600,7 @@ static void command_event_undo_save_state(char *s, size_t len)
    if (!content_undo_save_state())
    {
       snprintf(s, len, "%s \"%s\".",
-            msg_hash_to_str(MSG_FAILED_TO_SAVE_UNDO),
+            msg_hash_to_str(MSG_FAILED_TO_UNDO_SAVE_STATE),
             "from internal buffer");
    }
 }
@@ -1638,7 +1638,7 @@ static void command_event_undo_load_state(char *s, size_t len)
    if (!content_undo_load_state())
    {
       snprintf(s, len, "%s \"%s\".",
-            msg_hash_to_str(MSG_FAILED_TO_LOAD_UNDO),
+            msg_hash_to_str(MSG_FAILED_TO_UNDO_LOAD_STATE),
             "from internal buffer");
    }
 }
diff --git a/internal buffer b/internal buffer
new file mode 100644
index 0000000000000000000000000000000000000000..84b907ed8eb914cfb32722a72f8b8517e345225a
GIT binary patch
literal 83988
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

literal 0
HcmV?d00001

diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index 5c331af928..201d20f599 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -112,13 +112,13 @@ const char *msg_hash_to_str_us(uint32_t hash)
       case MSG_RESET:
          return "Reset";
       case MSG_FAILED_TO_LOAD_STATE:
-         return "Failed to load state from";
+         return "Nothing to undo.";
       case MSG_FAILED_TO_SAVE_STATE_TO:
          return "Failed to save state to";
-      case MSG_FAILED_TO_LOAD_UNDO:
-         return "No undo state found";
-      case MSG_FAILED_TO_SAVE_UNDO:
-         return "Failed to save undo information";
+      case MSG_FAILED_TO_UNDO_LOAD_STATE:
+         return "Failed to undo load state.";
+      case MSG_FAILED_TO_UNDO_SAVE_STATE:
+         return "Failed to undo save state.";
       case MSG_FAILED_TO_SAVE_SRAM:
          return "Failed to save SRAM";
       case MSG_STATE_SIZE:
diff --git a/msg_hash.h b/msg_hash.h
index 03a11f6b4d..d9481d08ac 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -125,8 +125,8 @@
 #define MSG_CORE_DOES_NOT_SUPPORT_SAVESTATES          0xd50adf46U
 #define MSG_FAILED_TO_LOAD_STATE                      0x91f348ebU
 
-#define MSG_FAILED_TO_LOAD_UNDO                       0xb6e2fc55U
-#define MSG_FAILED_TO_SAVE_UNDO                       0xf2e29478U
+#define MSG_FAILED_TO_UNDO_LOAD_STATE                 0xb6e2fc55U
+#define MSG_FAILED_TO_UNDO_SAVE_STATE                 0xf2e29478U
 
 #define MSG_RESET                                     0x10474288U
 
diff --git a/tasks/task_save_state.c b/tasks/task_save_state.c
index 67da9363ae..932727c3dc 100644
--- a/tasks/task_save_state.c
+++ b/tasks/task_save_state.c
@@ -64,6 +64,9 @@ struct sram_block
 
 bool content_undo_load_state()
 {
+   if (old_state_buf.data == NULL)
+      return false;
+
    unsigned i;
    //ssize_t size;
    retro_ctx_serialize_info_t serial_info;
@@ -78,9 +81,6 @@ bool content_undo_load_state()
          msg_hash_to_str(MSG_LOADING_STATE),
          "from internal buffer");
 
-   if (old_state_buf.size == 0)
-      return true;
-
    RARCH_LOG("%s: %u %s.\n",
          msg_hash_to_str(MSG_STATE_SIZE),
          old_state_buf.size,
@@ -165,7 +165,7 @@ bool content_undo_load_state()
 
    if (!ret)   
       RARCH_ERR("%s \"%s\".\n",
-         msg_hash_to_str(MSG_FAILED_TO_LOAD_STATE),
+         msg_hash_to_str(MSG_FAILED_TO_UNDO_LOAD_STATE),
          "from internal buffer");
 
    /* Wipe the old state buffer, it's meant to be one use only */
@@ -193,6 +193,11 @@ bool content_undo_save_state()
 
    old_save_file.data = 0;
 
+   if (!ret)   
+      RARCH_ERR("%s \"%s\".\n",
+         msg_hash_to_str(MSG_FAILED_TO_UNDO_SAVE_STATE),
+         "from internal buffer");
+
    return ret;
 }
 
@@ -202,7 +207,7 @@ bool content_undo_save_state()
 /**
  * save_state:
  * @path      : path of saved state that shall be written to.
- *
+ * @save_to_disk: If false, saves the state onto old_state_buf.
  * Save a state from memory to disk.
  *
  * Returns: true if successful, false otherwise.
@@ -278,13 +283,15 @@ bool content_save_state_with_backup(const char *path, bool save_to_disk)
 /**
  * content_load_state:
  * @path      : path that state will be loaded from.
- *
+ * @load_to_backup_buffer: If true, the state will be loaded into old_save_file.
  * Load a state from disk to memory.
  *
  * Returns: true if successful, false otherwise.
+ *
+ *
  **/
 bool content_load_state(const char* path) { content_load_state_with_backup(path, false); }
-bool content_load_state_with_backup(const char *path, bool save_to_backup_buffer)
+bool content_load_state_with_backup(const char *path, bool load_to_backup_buffer)
 {
    unsigned i;
    ssize_t size;
@@ -310,7 +317,7 @@ bool content_load_state_with_backup(const char *path, bool save_to_backup_buffer
 
    /* This means we're backing up the file in memory, so content_undo_save_state()
    can restore it */
-   if (save_to_backup_buffer) {
+   if (load_to_backup_buffer) {
       strcpy(old_save_file.path, path);
 
       /* If we were previously backing up a file, let go of it first */
@@ -381,7 +388,7 @@ bool content_load_state_with_backup(const char *path, bool save_to_backup_buffer
    serial_info.size       = size;
    
    /* Backup the current state so we can undo this load */
-   content_save_state_with_backup(NULL, true);
+   content_save_state_with_backup("internal buffer", false);
    ret                    = core_unserialize(&serial_info);
 
    /* Flush back. */