Merge pull request #2152 from lioncash/timer

DolphinWX: Clean up some wxTimer code

1 files changed, 2 insertions, 4 deletions

diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index f84d44ebf2..946cd52da3 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -508,15 +508,13 @@ CFrame::CFrame(wxFrame* parent,
 	// check if game is running
 	m_bHotkeysInit = InitControllers();
 
-	m_poll_hotkey_timer = new wxTimer(this);
+	m_poll_hotkey_timer.SetOwner(this);
 	Bind(wxEVT_TIMER, &CFrame::PollHotkeys, this);
-	m_poll_hotkey_timer->Start(1000 / 60, wxTIMER_CONTINUOUS);
+	m_poll_hotkey_timer.Start(1000 / 60, wxTIMER_CONTINUOUS);
 }
 // Destructor
 CFrame::~CFrame()
 {
-	m_poll_hotkey_timer->Stop();
-
 	if (m_bHotkeysInit)
 	{
 		Wiimote::Shutdown();