PathConfigPane: Prevent an invalid index assert

dolphin-emu · Jun 14, 2017 · 2a349f8 · 2a349f8
1 parent 9b8feb8
commit 2a349f8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Source/Core/DolphinWX/Config/PathConfigPane.cpp b/Source/Core/DolphinWX/Config/PathConfigPane.cpp
@@ -144,7 +144,14 @@ void PathConfigPane::BindEvents()
   m_wii_sdcard_filepicker->Bind(wxEVT_FILEPICKER_CHANGED, &PathConfigPane::OnSdCardPathChanged,
                                 this);
 
-  Bind(wxEVT_UPDATE_UI, &WxEventUtils::OnEnableIfCoreNotRunning);
+  Bind(wxEVT_UPDATE_UI, &PathConfigPane::OnEnableIfCoreNotRunning, this);
+}
+
+void PathConfigPane::OnEnableIfCoreNotRunning(wxUpdateUIEvent& event)
+{
+  // Prevent the Remove button from being enabled via wxUpdateUIEvent
+  if (event.GetId() != m_remove_iso_path_button->GetId())
+    WxEventUtils::OnEnableIfCoreNotRunning(event);
 }
 
 void PathConfigPane::OnISOPathSelectionChanged(wxCommandEvent& event)

diff --git a/Source/Core/DolphinWX/Config/PathConfigPane.h b/Source/Core/DolphinWX/Config/PathConfigPane.h
@@ -22,6 +22,8 @@ class PathConfigPane final : public wxPanel
   void LoadGUIValues();
   void BindEvents();
 
+  void OnEnableIfCoreNotRunning(wxUpdateUIEvent& event);
+
   void OnISOPathSelectionChanged(wxCommandEvent&);
   void OnRecursiveISOCheckBoxChanged(wxCommandEvent&);
   void OnAddISOPath(wxCommandEvent&);