The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
DolphinWX: Fix booting from DVD
This commit is contained in:
Mat M 2016-12-19 16:22:29 -05:00 committed by GitHub
commit 2c8cc0f648
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Frame.cpp
View File

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

2
Source/Core/DolphinWX/Frame.h
View File

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

3
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -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))