Build fix for non-windows

First step to fix UnitTest
hrydgard · Jan 28, 2017 · 860661d · 860661d
1 parent 2c58d34
commit 860661d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -1259,7 +1259,7 @@ namespace MainWindow {
 		return FALSE;
 	}
 
-	void ChangeMenu() {
+	void _ChangeMenu() {
 		SetIngameMenuItemStates(GetMenu(GetHWND()), UISTATE_INGAME);
 	}
 }