From 225d691bccaa30589f687259586d1e567075fd61 Mon Sep 17 00:00:00 2001 From: "j4ck.fr0st" Date: Sun, 24 Jan 2010 15:13:35 +0000 Subject: [PATCH] Make sure configuration can only be opened once git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4949 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp | 13 ++++++++----- Source/Plugins/Plugin_Wiimote/Src/main.cpp | 15 ++++++++------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp index ddafd516ae..96ef1c7b8a 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp @@ -623,11 +623,14 @@ void DllConfig(HWND _hParent) // Show wxDialog #if defined(HAVE_WX) && HAVE_WX - m_ConfigFrame = new PADConfigDialogSimple(GetParentedWxWindow(_hParent)); - m_ConfigFrame->ShowModal(); - m_ConfigFrame->Destroy(); - delete m_ConfigFrame; - m_ConfigFrame = NULL; + if (!m_ConfigFrame) + { + m_ConfigFrame = new PADConfigDialogSimple(GetParentedWxWindow(_hParent)); + m_ConfigFrame->ShowModal(); + m_ConfigFrame->Destroy(); + delete m_ConfigFrame; + m_ConfigFrame = NULL; + } #endif // Save configuration diff --git a/Source/Plugins/Plugin_Wiimote/Src/main.cpp b/Source/Plugins/Plugin_Wiimote/Src/main.cpp index b9c78300f6..6f0267e083 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/main.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/main.cpp @@ -181,13 +181,14 @@ void DllConfig(HWND _hParent) } #if defined(HAVE_WX) && HAVE_WX - - m_BasicConfigFrame = new WiimoteBasicConfigDialog(GetParentedWxWindow(_hParent)); - m_BasicConfigFrame->ShowModal(); - m_BasicConfigFrame->Destroy(); - delete m_BasicConfigFrame; - m_BasicConfigFrame = NULL; - + if (!m_BasicConfigFrame) + { + m_BasicConfigFrame = new WiimoteBasicConfigDialog(GetParentedWxWindow(_hParent)); + m_BasicConfigFrame->ShowModal(); + m_BasicConfigFrame->Destroy(); + delete m_BasicConfigFrame; + m_BasicConfigFrame = NULL; + } #endif }