summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/ControllerConfigDiag.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-02-13 20:22:01 -0500
committerLioncash <mathew1800@gmail.com>2015-02-13 20:22:01 -0500
commit6558704403aef17e89e44c22f111629ac214323f (patch)
tree6e814f76978384fc6afe019a59f874a2c36119c2 /Source/Core/DolphinWX/ControllerConfigDiag.cpp
parent4d3c1c7ec347d7dc6b8786be7f1b7c7effbd2d44 (diff)
parent9a6b6a99e8bf4927963c15c9073f34c28bc8f20d (diff)
Merge pull request #2030 from lioncash/destroy
DolphinWX: Get rid of unnecessary Destroy calls
Diffstat (limited to 'Source/Core/DolphinWX/ControllerConfigDiag.cpp')
-rw-r--r--Source/Core/DolphinWX/ControllerConfigDiag.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
index 63fe404533..6dec417c1c 100644
--- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp
+++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
@@ -412,17 +412,14 @@ void ControllerConfigDiag::ConfigEmulatedWiimote(wxCommandEvent& ev)
Wiimote::Initialize(reinterpret_cast<void*>(GetHandle()));
#endif
}
+
InputConfigDialog m_ConfigFrame(this, *wiimote_plugin, _("Dolphin Emulated Wiimote Configuration"), m_wiimote_index_from_conf_bt_id[ev.GetId()]);
m_ConfigFrame.ShowModal();
- m_ConfigFrame.Destroy();
+
if (!was_init) // if game isn't running
{
Wiimote::Shutdown();
}
-
- //InputConfigDialog* const m_emu_config_diag = new InputConfigDialog(this, *Wiimote::GetConfig(), _trans("Dolphin Emulated Wiimote Configuration"), m_wiimote_index_from_conf_bt_id[ev.GetId()]);
- //m_emu_config_diag->ShowModal();
- //m_emu_config_diag->Destroy();
}
void ControllerConfigDiag::RefreshRealWiimotes(wxCommandEvent&)
@@ -569,13 +566,11 @@ void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event)
{
InputConfigDialog m_ConfigFrame(this, *key_plugin, _("GameCube Controller Configuration"), port_num);
m_ConfigFrame.ShowModal();
- m_ConfigFrame.Destroy();
}
else
{
InputConfigDialog m_ConfigFrame(this, *pad_plugin, _("GameCube Controller Configuration"), port_num);
m_ConfigFrame.ShowModal();
- m_ConfigFrame.Destroy();
}
// if game isn't running