From 7cc80c32f9ebb520e361ecebf50cd424b9cf7e76 Mon Sep 17 00:00:00 2001
From: "XTra.KrazzY" <XTra.KrazzY@gmail.com>
Date: Thu, 5 Feb 2009 05:44:16 +0000
Subject: [PATCH] Fixed Wiimote config window closing (Don't use EndModal if
 you aren't using ShowModal)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2117 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DolphinWX/Src/ISOProperties.cpp | 6 ++----
 Source/Plugins/Plugin_Wiimote/Src/main.cpp  | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index ff370944a5..fbf3cf1e9f 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -139,10 +139,8 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 
 CISOProperties::~CISOProperties()
 {
-    if (pFileSystem)
-	delete pFileSystem;
-    if (OpenISO)
-	delete OpenISO;
+    delete pFileSystem;
+    delete OpenISO;
 }
 
 void CISOProperties::CreateDirectoryTree(wxTreeItemId& parent, 
diff --git a/Source/Plugins/Plugin_Wiimote/Src/main.cpp b/Source/Plugins/Plugin_Wiimote/Src/main.cpp
index 1a8479b1b6..17f738067d 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/main.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/main.cpp
@@ -161,10 +161,8 @@ void DllConfig(HWND _hParent)
 
 	frame = new ConfigDialog(&win);
 	g_FrameOpen = true;
-	/* We don't need to use ShowModal() anymore becaue FreeLibrary() is not called after this function
-	   anymore */
-	//frame->ShowModal();
-	frame->Show();	
+
+	frame->ShowModal();	
 
 	#ifdef _WIN32
 		win.SetHWND(0);