The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-05 07:13:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

DolphinWX: Fix GC/Wiimote input windows randomly crashing on OSX

Browse Source
This commit is contained in:
Lioncash 2014-09-18 14:47:55 -04:00
parent e9164247d6
commit 207d7787a4
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 #if defined(HAVE_X11) && HAVE_X11
Window win = X11Utils::XWindowFromHandle(GetHandle()); Window win = X11Utils::XWindowFromHandle(GetHandle());
Pad::Initialize((void *)win); Pad::Initialize(reinterpret_cast<void*>(win));
#elif defined(__APPLE__)
Pad::Initialize((void *)this);
#else #else
Pad::Initialize(GetHandle()); Pad::Initialize(reinterpret_cast<void*>(GetHandle()));
#endif #endif
} }
InputConfigDialog m_ConfigFrame(this, *pad_plugin, _trans("Dolphin GCPad Configuration")); 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 #if defined(HAVE_X11) && HAVE_X11
Window win = X11Utils::XWindowFromHandle(GetHandle()); Window win = X11Utils::XWindowFromHandle(GetHandle());
Wiimote::Initialize((void *)win); Wiimote::Initialize(reinterpret_cast<void*>(win));
#elif defined(__APPLE__)
Wiimote::Initialize((void *)this);
#else #else
Wiimote::Initialize(GetHandle()); Wiimote::Initialize(reinterpret_cast<void*>(GetHandle()));
#endif #endif
} }
WiimoteConfigDiag m_ConfigFrame(this, *wiimote_plugin); WiimoteConfigDiag m_ConfigFrame(this, *wiimote_plugin);