Merge pull request #4527 from leoetlino/fix-dvd-backup

DolphinWX: Fix booting from DVD

Source/Core/DolphinWX/Frame.cpp

@@ -468,8 +468,6 @@ CFrame::~CFrame()
   HotkeyManagerEmu::Shutdown();
   g_controller_interface.Shutdown();
 
-  drives.clear();
-
 #if defined(HAVE_XRANDR) && HAVE_XRANDR
   delete m_XRRConfig;
 #endif

Source/Core/DolphinWX/Frame.h

@@ -162,8 +162,6 @@ private:
   bool m_tried_graceful_shutdown = false;
   int m_saveSlot = 1;
 
-  std::vector<std::string> drives;
-
   enum
   {
     ADD_PANE_TOP,

Source/Core/DolphinWX/FrameTools.cpp

@@ -733,7 +733,8 @@ void CFrame::StartGame(const std::string& filename)
 
 void CFrame::OnBootDrive(wxCommandEvent& event)
 {
-  BootGame(drives[event.GetId() - IDM_DRIVE1]);
+  const auto* menu = static_cast<wxMenu*>(event.GetEventObject());
+  BootGame(WxStrToStr(menu->GetLabelText(event.GetId())));
 }
 
 void CFrame::OnRefresh(wxCommandEvent& WXUNUSED(event))