diff --git a/desmume/src/windows/hotkey.cpp b/desmume/src/windows/hotkey.cpp index 4ee8704b2..97d5ea847 100644 --- a/desmume/src/windows/hotkey.cpp +++ b/desmume/src/windows/hotkey.cpp @@ -156,8 +156,8 @@ void HK_StateLoadSlot(int num, bool justPressed) loadstate_slot(num); //Loadstate lastSaveState = num; //Set last savestate used - Update_RAM_Watch(); //adelikat: TODO this should be a single function call in main, that way we can expand as future dialogs need updating - Update_RAM_Search(); //main.cpp - case IDM_STATE_LOAD: also calls these functions + //adelikat: TODO this should be a single function call in main, that way we can expand as future dialogs need updating + Update_RAM_Search(); //Update_RAM_Watch() is also called; main.cpp - case IDM_STATE_LOAD: also calls these functions if(!wasPaused) NDS_UnPause(); diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index cd42bef4c..ae4f339f9 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -1258,9 +1258,7 @@ static void StepRunLoop_User() mainLoopData.toolframecount = 0; } - - Update_RAM_Watch(); - Update_RAM_Search(); + Update_RAM_Search(); // Update_RAM_Watch() is also called. mainLoopData.fpsframecount++; QueryPerformanceCounter((LARGE_INTEGER *)&mainLoopData.curticks); @@ -3413,8 +3411,8 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM if ((fileDropped[extIndex+3] >= '0' && fileDropped[extIndex+3] <= '9') || fileDropped[extIndex+3] == '-' || fileDropped[extIndex+3] == 't') //If last character is 0-9 (making .ds0 - .ds9) or .dst { savestate_load(filename); - Update_RAM_Watch(); //adelikat: TODO this should be a single function call in main, that way we can expand as future dialogs need updating - Update_RAM_Search(); //hotkey.cpp - HK_StateLoadSlot & State_Load also call these functions + //adelikat: TODO this should be a single function call in main, that way we can expand as future dialogs need updating + Update_RAM_Search(); //Update_RAM_Watch() is also called; hotkey.cpp - HK_StateLoadSlot & State_Load also call these functions } } } @@ -3692,8 +3690,8 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM } savestate_load(SavName); - Update_RAM_Watch(); //adelikat: TODO this should be a single function call in main, that way we can expand as future dialogs need updating - Update_RAM_Search(); //hotkey.cpp - HK_StateLoadSlot also calls these functions + //adelikat: TODO this should be a single function call in main, that way we can expand as future dialogs need updating + Update_RAM_Search(); //Update_RAM_Watch() is also called; hotkey.cpp - HK_StateLoadSlot also calls these functions NDS_UnPause(); } return 0;