Merge pull request #9216 from JosJuice/android-load-time

Android: Don't reset savestate time on load

1 files changed, 10 insertions, 5 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveLoadStateFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveLoadStateFragment.java
index 3454b6d83d..7d93ca14f6 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveLoadStateFragment.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveLoadStateFragment.java
@@ -104,11 +104,16 @@ public final class SaveLoadStateFragment extends Fragment implements View.OnClic
     int action = (mSaveOrLoad == SaveOrLoad.SAVE ? saveActionsMap : loadActionsMap)[buttonIndex];
     ((EmulationActivity) getActivity()).handleMenuAction(action);
 
-    // The savestate most likely hasn't gotten saved yet (it happens asynchronously),
-    // so we unfortunately can't rely on setButtonText/GetUnixTimeOfStateSlot here.
-    Button button = (Button) view;
-    CharSequence time = DateUtils.getRelativeTimeSpanString(0, 0, DateUtils.MINUTE_IN_MILLIS);
-    button.setText(getString(R.string.emulation_state_slot, buttonIndex + 1, time));
+    if (mSaveOrLoad == SaveOrLoad.SAVE)
+    {
+      // Update the "last modified" time.
+      // The savestate most likely hasn't gotten saved to disk yet (it happens asynchronously),
+      // so we unfortunately can't rely on setButtonText/GetUnixTimeOfStateSlot here.
+
+      Button button = (Button) view;
+      CharSequence time = DateUtils.getRelativeTimeSpanString(0, 0, DateUtils.MINUTE_IN_MILLIS);
+      button.setText(getString(R.string.emulation_state_slot, buttonIndex + 1, time));
+    }
   }
 
   private void setButtonText(Button button, int index)