diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-02-13 20:22:01 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-02-13 20:22:01 -0500 |
| commit | 6558704403aef17e89e44c22f111629ac214323f (patch) | |
| tree | 6e814f76978384fc6afe019a59f874a2c36119c2 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 4d3c1c7ec347d7dc6b8786be7f1b7c7effbd2d44 (diff) | |
| parent | 9a6b6a99e8bf4927963c15c9073f34c28bc8f20d (diff) | |
Merge pull request #2030 from lioncash/destroy
DolphinWX: Get rid of unnecessary Destroy calls
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 698b020f71..6afcb62312 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -1349,14 +1349,12 @@ void CFrame::OnConfigControllers(wxCommandEvent& WXUNUSED (event)) { ControllerConfigDiag config_dlg(this); config_dlg.ShowModal(); - config_dlg.Destroy(); } void CFrame::OnConfigMenuCommands(wxCommandEvent& WXUNUSED(event)) { - HotkeyConfigDialog *m_HotkeyDialog = new HotkeyConfigDialog(this); - m_HotkeyDialog->ShowModal(); - m_HotkeyDialog->Destroy(); + HotkeyConfigDialog m_HotkeyDialog(this); + m_HotkeyDialog.ShowModal(); // Update the GUI in case menu accelerators were changed UpdateGUI(); @@ -1384,9 +1382,8 @@ void CFrame::OnConfigHotkey(wxCommandEvent& WXUNUSED (event)) #endif } - InputConfigDialog m_ConfigFrame(this, *hotkey_plugin, _("Dolphin Hotkeys"), 0); + InputConfigDialog m_ConfigFrame(this, *hotkey_plugin, _("Dolphin Hotkeys")); m_ConfigFrame.ShowModal(); - m_ConfigFrame.Destroy(); // if game isn't running if (!was_init) |
