From 2acf3570e00b370fd6f09a6794a1dcd7ee02829e Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 8 Nov 2016 20:52:45 -0500
Subject: PathConfigPane: Eliminate main frame global usage

---
 Source/Core/DolphinWX/FrameTools.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'Source/Core/DolphinWX/FrameTools.cpp')

diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index 00bc54917d..e68c2a27f9 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -1072,6 +1072,11 @@ void CFrame::OnUpdateInterpreterMenuItem(wxUpdateUIEvent& event)
   event.Check(SConfig::GetInstance().iCPUCore == PowerPC::CORE_INTERPRETER);
 }
 
+void CFrame::OnUpdateLoadWiiMenuItem(wxCommandEvent& WXUNUSED(event))
+{
+  UpdateLoadWiiMenuItem();
+}
+
 void CFrame::ClearStatusBar()
 {
   if (this->GetStatusBar()->IsEnabled())
@@ -1184,16 +1189,13 @@ void CFrame::OnInstallWAD(wxCommandEvent& event)
   u64 titleID = DiscIO::CNANDContentManager::Access().Install_WiiWAD(fileName);
   if (titleID == TITLEID_SYSMENU)
   {
-    UpdateWiiMenuChoice();
+    UpdateLoadWiiMenuItem();
   }
 }
 
-void CFrame::UpdateWiiMenuChoice(wxMenuItem* WiiMenuItem)
+void CFrame::UpdateLoadWiiMenuItem() const
 {
-  if (!WiiMenuItem)
-  {
-    WiiMenuItem = GetMenuBar()->FindItem(IDM_LOAD_WII_MENU);
-  }
+  auto* const WiiMenuItem = GetMenuBar()->FindItem(IDM_LOAD_WII_MENU);
 
   const DiscIO::CNANDContentLoader& SysMenu_Loader =
       DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU,
-- 
cgit v1.2.3