From 207d7787a435515c47cbba0b12d7d1341dda596c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 18 Sep 2014 14:47:55 -0400 Subject: [PATCH] DolphinWX: Fix GC/Wiimote input windows randomly crashing on OSX --- Source/Core/DolphinWX/FrameTools.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 4045879e31..e6a9aaad17 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -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(win)); #else - Pad::Initialize(GetHandle()); + Pad::Initialize(reinterpret_cast(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(win)); #else - Wiimote::Initialize(GetHandle()); + Wiimote::Initialize(reinterpret_cast(GetHandle())); #endif } WiimoteConfigDiag m_ConfigFrame(this, *wiimote_plugin);