From f6ef6a317da7d632dd96b266789fec88f346fbd9 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 2 Nov 2020 10:47:39 +0100 Subject: [PATCH] Android: Don't reset savestate time on load --- .../fragments/SaveLoadStateFragment.java | 15 ++++++++++----- 1 file 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)