diff --git a/Core/HLE/sceUmd.cpp b/Core/HLE/sceUmd.cpp index e2aac0021e..d191fdb27d 100644 --- a/Core/HLE/sceUmd.cpp +++ b/Core/HLE/sceUmd.cpp @@ -23,6 +23,7 @@ #include "Core/Loaders.h" #include "Core/MemMap.h" #include "Core/System.h" +#include "Core/Host.h" #include "Core/CoreTiming.h" #include "Core/Reporting.h" #include "Core/MIPS/MIPS.h" @@ -38,9 +39,6 @@ #include "Core/FileSystems/MetaFileSystem.h" #include "Core/FileSystems/ISOFileSystem.h" #include "Core/FileSystems/VirtualDiscFileSystem.h" -#ifdef USING_WIN_UI -#include "Windows/MainWindowMenu.h" -#endif const u64 MICRO_DELAY_ACTIVATE = 4000; @@ -102,10 +100,8 @@ void __UmdDoState(PointerWrap &p) if (s > 1) { p.Do(UMDReplacePermit); -#ifdef USING_WIN_UI if (UMDReplacePermit) - MainWindowMenu:MainWindow::_ChangeMenu(); -#endif + host->UpdateUI(); } if (s > 2) { p.Do(umdInsertChangeEvent); @@ -539,9 +535,7 @@ static u32 sceUmdReplaceProhibit() { UMDReplacePermit = false; DEBUG_LOG(SCEIO,"sceUmdReplaceProhibit()"); -#ifdef USING_WIN_UI - MainWindowMenu:MainWindow::_ChangeMenu(); -#endif + host->UpdateUI(); return 0; } @@ -549,9 +543,7 @@ static u32 sceUmdReplacePermit() { UMDReplacePermit = true; DEBUG_LOG(SCEIO,"sceUmdReplacePermit()"); -#ifdef USING_WIN_UI - MainWindowMenu:MainWindow::_ChangeMenu(); -#endif + host->UpdateUI(); return 0; } diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index 19c78593e6..5178c396fb 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -858,6 +858,7 @@ namespace MainWindow break; case WM_USER_UPDATE_UI: + // This also calls ChangeMenu TranslateMenus(hwndMain, menu); break; diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index fed360fb4a..da870a8d1a 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -1259,7 +1259,7 @@ namespace MainWindow { return FALSE; } - void _ChangeMenu() { + void ChangeMenu() { SetIngameMenuItemStates(GetMenu(GetHWND()), UISTATE_INGAME); } }