From 860661dc14a3e9ee4f02e8b9d35f9d1135c9a3d6 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Sun, 29 Jan 2017 03:56:49 +0800 Subject: [PATCH] Build fix for non-windows First step to fix UnitTest --- Core/HLE/sceUmd.cpp | 8 +++++--- Windows/MainWindowMenu.cpp | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Core/HLE/sceUmd.cpp b/Core/HLE/sceUmd.cpp index f8bef0d8ef..e2aac0021e 100644 --- a/Core/HLE/sceUmd.cpp +++ b/Core/HLE/sceUmd.cpp @@ -102,8 +102,10 @@ void __UmdDoState(PointerWrap &p) if (s > 1) { p.Do(UMDReplacePermit); +#ifdef USING_WIN_UI if (UMDReplacePermit) - MainWindow::ChangeMenu(); + MainWindowMenu:MainWindow::_ChangeMenu(); +#endif } if (s > 2) { p.Do(umdInsertChangeEvent); @@ -538,7 +540,7 @@ static u32 sceUmdReplaceProhibit() UMDReplacePermit = false; DEBUG_LOG(SCEIO,"sceUmdReplaceProhibit()"); #ifdef USING_WIN_UI - MainWindow::ChangeMenu(); + MainWindowMenu:MainWindow::_ChangeMenu(); #endif return 0; } @@ -548,7 +550,7 @@ static u32 sceUmdReplacePermit() UMDReplacePermit = true; DEBUG_LOG(SCEIO,"sceUmdReplacePermit()"); #ifdef USING_WIN_UI - MainWindow::ChangeMenu(); + MainWindowMenu:MainWindow::_ChangeMenu(); #endif return 0; } diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index da870a8d1a..fed360fb4a 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); } }