ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1110 from lioncash/apple-code 

DolphinWX: Fix GC/Wiimote input windows randomly crashing on OSX
This commit is contained in:
Lioncash 2014-09-18 20:17:16 -04:00
parent 88196d373f 207d7787a4
commit 68d62c3d32
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1245,11 +1245,9 @@ void CFrame::OnConfigPAD(wxCommandEvent& WXUNUSED (event))
{
#if defined(HAVE_X11) && HAVE_X11
Window win = X11Utils::XWindowFromHandle(GetHandle());
Pad::Initialize((void *)win);
#elif defined(__APPLE__)
Pad::Initialize((void *)this);
Pad::Initialize(reinterpret_cast<void*>(win));
#else
Pad::Initialize(GetHandle());
Pad::Initialize(reinterpret_cast<void*>(GetHandle()));
#endif
}
InputConfigDialog m_ConfigFrame(this, *pad_plugin, _trans("Dolphin GCPad Configuration"));
@ -1273,11 +1271,9 @@ void CFrame::OnConfigWiimote(wxCommandEvent& WXUNUSED (event))
{
#if defined(HAVE_X11) && HAVE_X11
Window win = X11Utils::XWindowFromHandle(GetHandle());
Wiimote::Initialize((void *)win);
#elif defined(__APPLE__)
Wiimote::Initialize((void *)this);
Wiimote::Initialize(reinterpret_cast<void*>(win));
#else
Wiimote::Initialize(GetHandle());
Wiimote::Initialize(reinterpret_cast<void*>(GetHandle()));
#endif
}
WiimoteConfigDiag m_ConfigFrame(this, *wiimote_plugin);