From 40d1a4ed75d3c976bdfd68816616c57a46e028c2 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Sat, 17 Sep 2016 20:28:42 +1000
Subject: [PATCH] [roject64] Handle ID_SYSTEM_CHEAT with OnCheats

---
 .../Project64/UserInterface/MainMenuClass.cpp | 29 ++++++++++---------
 .../Project64/UserInterface/MainMenuClass.h   |  2 ++
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Source/Project64/UserInterface/MainMenuClass.cpp b/Source/Project64/UserInterface/MainMenuClass.cpp
index fb74ae506..b29c518ea 100644
--- a/Source/Project64/UserInterface/MainMenuClass.cpp
+++ b/Source/Project64/UserInterface/MainMenuClass.cpp
@@ -266,6 +266,20 @@ void CMainMenu::OnLodState(HWND hWnd)
     }
     g_BaseSystem->ExternalEvent(SysEvent_ResumeCPU_LoadGame);
 }
+
+void CMainMenu::OnCheats(HWND hWnd)
+{
+    CCheatsUI * cheatUI = new CCheatsUI;
+    g_cheatUI = cheatUI;
+    cheatUI->SelectCheats(hWnd, false);
+}
+
+void CMainMenu::OnSettings(HWND hWnd)
+{
+    CSettingConfig SettingConfig;
+    SettingConfig.Display(hWnd);
+}
+
 bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuID)
 {
     switch (MenuID)
@@ -350,13 +364,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
         g_BaseSystem->ExternalEvent(SysEvent_LoadMachineState);
         break;
     case ID_SYSTEM_LOAD: OnLodState(hWnd); break;
-    case ID_SYSTEM_CHEAT:
-        {
-            CCheatsUI * cheatUI = new CCheatsUI;
-            g_cheatUI = cheatUI;
-            cheatUI->SelectCheats(hWnd, false);
-        }
-        break;
+    case ID_SYSTEM_CHEAT: OnCheats(hWnd); break;
     case ID_SYSTEM_GSBUTTON:
         g_BaseSystem->ExternalEvent(SysEvent_GSButtonPressed);
         break;
@@ -469,12 +477,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
             g_Settings->SaveBool(UserInterface_ShowCPUPer, true);
         }
         break;
-    case ID_OPTIONS_SETTINGS:
-        {
-            CSettingConfig SettingConfig;
-            SettingConfig.Display(hWnd);
-        }
-        break;
+    case ID_OPTIONS_SETTINGS: OnSettings(hWnd);  break;
     case ID_PROFILE_PROFILE:
         g_Settings->SaveBool(Debugger_ProfileCode, !g_Settings->LoadBool(Debugger_ProfileCode));
         g_BaseSystem->ExternalEvent(SysEvent_Profile_StartStop);
diff --git a/Source/Project64/UserInterface/MainMenuClass.h b/Source/Project64/UserInterface/MainMenuClass.h
index 5d1de403a..6d34ae29a 100644
--- a/Source/Project64/UserInterface/MainMenuClass.h
+++ b/Source/Project64/UserInterface/MainMenuClass.h
@@ -80,6 +80,8 @@ private:
     void OnSaveAs(HWND hWnd);
     void OnLodState(HWND hWnd);
     void OnCheats(HWND hWnd);
+    void OnSettings(HWND hWnd);
+
     void FillOutMenu(HMENU hMenu);
     std::wstring GetSaveSlotString(int Slot);
     stdstr GetFileLastMod(const CPath & FileName);