From 712b23d512c571b506532226652e638392e3cbef Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Tue, 5 May 2009 00:02:43 +0000
Subject: [PATCH] win32: fix #2785867 (date & timestamp not shown on savestate
 slot immediately)

---
 desmume/src/windows/hotkey.cpp | 1 +
 desmume/src/windows/main.cpp   | 2 +-
 desmume/src/windows/main.h     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/desmume/src/windows/hotkey.cpp b/desmume/src/windows/hotkey.cpp
index 9bbf56e38..e73ed2851 100644
--- a/desmume/src/windows/hotkey.cpp
+++ b/desmume/src/windows/hotkey.cpp
@@ -118,6 +118,7 @@ void HK_StateSaveSlot(int num)
 	
 	lastSaveState = num;		//Set last savestate used
 	SaveStateMessages(num, 0);	//Display state loaded message
+	LoadSaveStateInfo();
 }
 
 void HK_StateLoadSlot(int num)
diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index 21f7ecb54..6da8ebb4a 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -2824,6 +2824,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
 				}
 
 				savestate_save(SavName);
+				LoadSaveStateInfo();
 				NDS_UnPause();
 			}
 			return 0;
@@ -2838,7 +2839,6 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
 		case IDM_STATE_SAVE_F9:
 		case IDM_STATE_SAVE_F10:
 				HK_StateSaveSlot( abs(IDM_STATE_SAVE_F1 - LOWORD(wParam)) +1);
-				LoadSaveStateInfo();
 				return 0;
 
 		case IDM_STATE_LOAD_F1:
diff --git a/desmume/src/windows/main.h b/desmume/src/windows/main.h
index 40e250c5b..b64c91ee9 100644
--- a/desmume/src/windows/main.h
+++ b/desmume/src/windows/main.h
@@ -8,6 +8,7 @@ extern volatile BOOL execute, paused;
 void NDS_Pause();
 void NDS_UnPause();
 extern unsigned int lastSaveState;
+void LoadSaveStateInfo();
 void SaveStateMessages(int slotnum, int whichMessage);
 void Display();
 void Pause();