Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-10-08 03:13:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better way of updating menus on UMD switching calls

Browse Source
This commit is contained in:
Henrik Rydgard 2017-01-29 11:41:31 +01:00
parent d344f30162
commit 03b607f389
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Core/HLE/sceUmd.cpp
View File

@ -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;
}

1
Windows/MainWindow.cpp
View File

@ -858,6 +858,7 @@ namespace MainWindow
break;
case WM_USER_UPDATE_UI:
// This also calls ChangeMenu
TranslateMenus(hwndMain, menu);
break;

2
Windows/MainWindowMenu.cpp
View File

@ -1259,7 +1259,7 @@ namespace MainWindow {
return FALSE;
}
void _ChangeMenu() {
void ChangeMenu() {
SetIngameMenuItemStates(GetMenu(GetHWND()), UISTATE_INGAME);
}
}