ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project64] Add OnEndEmulation to handle ID_FILE_ENDEMULATION

This commit is contained in:
zilmar 2016-09-17 16:33:05 +10:00
parent eb0335bc1e
commit b8bd3b1556
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Source/Project64/UserInterface/MainMenuClass.cpp
View File

@ -166,12 +166,7 @@ void CMainMenu::OnOpenRom(HWND hWnd)
} }
} }
bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuID) void CMainMenu::OnRomInfo(HWND hWnd)
{
switch (MenuID)
{
case ID_FILE_OPEN_ROM: OnOpenRom(hWnd); break;
case ID_FILE_ROM_INFO:
{ {
if (g_Rom) if (g_Rom)
{ {
@ -179,7 +174,24 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
Info.DisplayInformation(hWnd); Info.DisplayInformation(hWnd);
} }
} }
break;
void CMainMenu::OnEndEmulation(void)
{
CGuard Guard(m_CS);
WriteTrace(TraceUserInterface, TraceDebug, "ID_FILE_ENDEMULATION");
if (g_BaseSystem)
{
g_BaseSystem->CloseCpu();
}
m_Gui->SaveWindowLoc();
}
bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuID)
{
switch (MenuID)
{
case ID_FILE_OPEN_ROM: OnOpenRom(hWnd); break;
case ID_FILE_ROM_INFO: OnRomInfo(hWnd); break;
case ID_FILE_STARTEMULATION: case ID_FILE_STARTEMULATION:
m_Gui->SaveWindowLoc(); m_Gui->SaveWindowLoc();
//Now we have created again, we can start up emulation //Now we have created again, we can start up emulation
@ -192,17 +204,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
g_Notify->BreakPoint(__FILE__, __LINE__); g_Notify->BreakPoint(__FILE__, __LINE__);
} }
break; break;
case ID_FILE_ENDEMULATION: case ID_FILE_ENDEMULATION: OnEndEmulation(); break;
{
CGuard Guard(m_CS);
WriteTrace(TraceUserInterface, TraceDebug, "ID_FILE_ENDEMULATION");
if (g_BaseSystem)
{
g_BaseSystem->CloseCpu();
}
m_Gui->SaveWindowLoc();
}
break;
case ID_FILE_ROMDIRECTORY: case ID_FILE_ROMDIRECTORY:
WriteTrace(TraceUserInterface, TraceDebug, "ID_FILE_ROMDIRECTORY 1"); WriteTrace(TraceUserInterface, TraceDebug, "ID_FILE_ROMDIRECTORY 1");
m_Gui->SelectRomDir(); m_Gui->SelectRomDir();

2
Source/Project64/UserInterface/MainMenuClass.h
View File

@ -74,6 +74,8 @@ private:
CMainMenu& operator=(const CMainMenu&); // Disable assignment CMainMenu& operator=(const CMainMenu&); // Disable assignment
void OnOpenRom(HWND hWnd); void OnOpenRom(HWND hWnd);
void OnRomInfo(HWND hWnd);
void OnEndEmulation(void);
void FillOutMenu(HMENU hMenu); void FillOutMenu(HMENU hMenu);
std::wstring GetSaveSlotString(int Slot); std::wstring GetSaveSlotString(int Slot);
stdstr GetFileLastMod(const CPath & FileName); stdstr GetFileLastMod(const CPath & FileName);