diff --git a/Source/Core/Core/Src/EventHandler.cpp b/Source/Core/Core/Src/EventHandler.cpp
index f252524343..c93e16d2ad 100644
--- a/Source/Core/Core/Src/EventHandler.cpp
+++ b/Source/Core/Core/Src/EventHandler.cpp
@@ -50,78 +50,78 @@ int EventHandler::wxCharCodeWXToSF(int id)
     int sfKey;
 
     switch (id) {
-	//case WXK_CANCEL:        sfKey = sf::Key::Cancel; break;
-	//case WXK_BACK:          sfKey = sf::Key::BackSpace; break;
-    case WXK_TAB:           sfKey = sf::Key::Tab; break;
-	//case WXK_CLEAR:         sfKey = sf::Key::Clear; break;
-    case WXK_RETURN:        sfKey = sf::Key::Return; break;
-    case WXK_SHIFT:         sfKey = sf::Key::LShift; break;
-    case WXK_CONTROL:       sfKey = sf::Key::LControl; break;
-    case WXK_ALT:           sfKey = sf::Key::LAlt; break;
-	//case WXK_CAPITAL:       sfKey = sf::Key::Caps_Lock; break;
-    case WXK_MENU :         sfKey = sf::Key::Menu; break;
-    case WXK_PAUSE:         sfKey = sf::Key::Pause; break;
-    case WXK_ESCAPE:        sfKey = sf::Key::Escape; break;
-    case WXK_SPACE:         sfKey = sf::Key::Space; break;
-    case WXK_PAGEUP:        sfKey =sf::Key::PageUp; break;
-    case WXK_PAGEDOWN:      sfKey =sf::Key::PageDown; break;
-    case WXK_END:           sfKey =sf::Key::End; break;
-    case WXK_HOME :         sfKey =sf::Key::Home; break;
-    case WXK_LEFT :         sfKey =sf::Key::Left; break;
-    case WXK_UP:            sfKey =sf::Key::Up; break;
-    case WXK_RIGHT:         sfKey =sf::Key::Right; break;
-    case WXK_DOWN :         sfKey =sf::Key::Down; break;
-	//case WXK_SELECT:        sfKey =sf::Key::Select; break;
-	//case WXK_PRINT:         sfKey =sf::Key::Print; break;
-	//case WXK_EXECUTE:       sfKey =sf::Key::Execute; break;
-    case WXK_INSERT:        sfKey =sf::Key::Insert; break;
-    case WXK_DELETE:        sfKey =sf::Key::Delete; break;
-	//case WXK_HELP :         sfKey =sf::Key::Help; break;
-    case WXK_NUMPAD0:       sfKey =sf::Key::Numpad0; break; 
-    case WXK_NUMPAD_INSERT: sfKey =sf::Key::Insert; break;
-    case WXK_NUMPAD1:       sfKey =sf::Key::Numpad1; break; 
-    case WXK_NUMPAD_END:    sfKey =sf::Key::End; break;
-    case WXK_NUMPAD2:       sfKey =sf::Key::Numpad2; break; 
-    case WXK_NUMPAD_DOWN:   sfKey =sf::Key::Down; break;
-    case WXK_NUMPAD3:       sfKey =sf::Key::Numpad3; break; 
-    case WXK_NUMPAD_PAGEDOWN: sfKey =sf::Key::PageDown; break;
-    case WXK_NUMPAD4:       sfKey =sf::Key::Numpad4; break; 
-    case WXK_NUMPAD_LEFT:   sfKey =sf::Key::Left; break;
-    case WXK_NUMPAD5:       sfKey =sf::Key::Numpad5; break;
-    case WXK_NUMPAD6:       sfKey =sf::Key::Numpad6; break; 
-    case WXK_NUMPAD_RIGHT:  sfKey =sf::Key::Right; break;
-    case WXK_NUMPAD7:       sfKey =sf::Key::Numpad7; break; 
-    case WXK_NUMPAD_HOME:   sfKey =sf::Key::Home; break;
-    case WXK_NUMPAD8:       sfKey =sf::Key::Numpad8; break; 
-    case WXK_NUMPAD_UP:     sfKey =sf::Key::Up; break;
-    case WXK_NUMPAD9:       sfKey =sf::Key::Numpad9; break; 
-    case WXK_NUMPAD_PAGEUP:   sfKey =sf::Key::PageUp; break;
-	//case WXK_NUMPAD_DECIMAL:  sfKey =sf::Key::Decimal; break; 
-    case WXK_NUMPAD_DELETE:   sfKey =sf::Key::Delete; break;
-    case WXK_NUMPAD_MULTIPLY: sfKey =sf::Key::Multiply; break;
-    case WXK_NUMPAD_ADD:      sfKey =sf::Key::Add; break;
-    case WXK_NUMPAD_SUBTRACT: sfKey =sf::Key::Subtract; break;
-    case WXK_NUMPAD_DIVIDE:   sfKey =sf::Key::Divide; break;
-    case WXK_NUMPAD_ENTER:    sfKey =sf::Key::Return; break;
-	//case WXK_NUMPAD_SEPARATOR: sfKey =sf::Key::Separator; break;
-    case WXK_F1:            sfKey =sf::Key::F1; break;
-    case WXK_F2:            sfKey =sf::Key::F2; break;
-    case WXK_F3:            sfKey =sf::Key::F3; break;
-    case WXK_F4:            sfKey =sf::Key::F4; break;
-    case WXK_F5:            sfKey =sf::Key::F5; break;
-    case WXK_F6:            sfKey =sf::Key::F6; break;
-    case WXK_F7:            sfKey =sf::Key::F7; break;
-    case WXK_F8:            sfKey =sf::Key::F8; break;
-    case WXK_F9:            sfKey =sf::Key::F9; break;
-    case WXK_F10:           sfKey =sf::Key::F10; break;
-    case WXK_F11:           sfKey =sf::Key::F11; break;
-    case WXK_F12:           sfKey =sf::Key::F12; break;
-    case WXK_F13:           sfKey =sf::Key::F13; break;
-    case WXK_F14:           sfKey =sf::Key::F14; break;
-    case WXK_F15:           sfKey =sf::Key::F15; break;
-	//case WXK_NUMLOCK:       sfKey =sf::Key::Num_Lock; break;
-	//case WXK_SCROLL:        sfKey =sf::Key::Scroll_Lock; break;
-    default:                sfKey = id <= 255 ? id : 0;
+//  case WXK_CANCEL:          sfKey = sf::Key::Cancel; break;
+//  case WXK_BACK:            sfKey = sf::Key::BackSpace; break;
+    case WXK_TAB:             sfKey = sf::Key::Tab; break;
+//  case WXK_CLEAR:           sfKey = sf::Key::Clear; break;
+    case WXK_RETURN:          sfKey = sf::Key::Return; break;
+    case WXK_SHIFT:           sfKey = sf::Key::LShift; break;
+    case WXK_CONTROL:         sfKey = sf::Key::LControl; break;
+    case WXK_ALT:             sfKey = sf::Key::LAlt; break;
+//  case WXK_CAPITAL:         sfKey = sf::Key::Caps_Lock; break;
+    case WXK_MENU :           sfKey = sf::Key::Menu; break;
+    case WXK_PAUSE:           sfKey = sf::Key::Pause; break;
+    case WXK_ESCAPE:          sfKey = sf::Key::Escape; break;
+    case WXK_SPACE:           sfKey = sf::Key::Space; break;
+    case WXK_PAGEUP:          sfKey = sf::Key::PageUp; break;
+    case WXK_PAGEDOWN:        sfKey = sf::Key::PageDown; break;
+    case WXK_END:             sfKey = sf::Key::End; break;
+    case WXK_HOME :           sfKey = sf::Key::Home; break;
+    case WXK_LEFT :           sfKey = sf::Key::Left; break;
+    case WXK_UP:              sfKey = sf::Key::Up; break;
+    case WXK_RIGHT:           sfKey = sf::Key::Right; break;
+    case WXK_DOWN :           sfKey = sf::Key::Down; break;
+//  case WXK_SELECT:          sfKey = sf::Key::Select; break;
+//  case WXK_PRINT:           sfKey = sf::Key::Print; break;
+//  case WXK_EXECUTE:         sfKey = sf::Key::Execute; break;
+    case WXK_INSERT:          sfKey = sf::Key::Insert; break;
+    case WXK_DELETE:          sfKey = sf::Key::Delete; break;
+//  case WXK_HELP :           sfKey = sf::Key::Help; break;
+    case WXK_NUMPAD0:         sfKey = sf::Key::Numpad0; break; 
+    case WXK_NUMPAD_INSERT:   sfKey = sf::Key::Insert; break;
+    case WXK_NUMPAD1:         sfKey = sf::Key::Numpad1; break; 
+    case WXK_NUMPAD_END:      sfKey = sf::Key::End; break;
+    case WXK_NUMPAD2:         sfKey = sf::Key::Numpad2; break; 
+    case WXK_NUMPAD_DOWN:     sfKey = sf::Key::Down; break;
+    case WXK_NUMPAD3:         sfKey = sf::Key::Numpad3; break; 
+    case WXK_NUMPAD_PAGEDOWN: sfKey = sf::Key::PageDown; break;
+    case WXK_NUMPAD4:         sfKey = sf::Key::Numpad4; break; 
+    case WXK_NUMPAD_LEFT:     sfKey = sf::Key::Left; break;
+    case WXK_NUMPAD5:         sfKey = sf::Key::Numpad5; break;
+    case WXK_NUMPAD6:         sfKey = sf::Key::Numpad6; break; 
+    case WXK_NUMPAD_RIGHT:    sfKey = sf::Key::Right; break;
+    case WXK_NUMPAD7:         sfKey = sf::Key::Numpad7; break; 
+    case WXK_NUMPAD_HOME:     sfKey = sf::Key::Home; break;
+    case WXK_NUMPAD8:         sfKey = sf::Key::Numpad8; break; 
+    case WXK_NUMPAD_UP:       sfKey = sf::Key::Up; break;
+    case WXK_NUMPAD9:         sfKey = sf::Key::Numpad9; break; 
+    case WXK_NUMPAD_PAGEUP:   sfKey = sf::Key::PageUp; break;
+//  case WXK_NUMPAD_DECIMAL:  sfKey = sf::Key::Decimal; break; 
+    case WXK_NUMPAD_DELETE:   sfKey = sf::Key::Delete; break;
+    case WXK_NUMPAD_MULTIPLY: sfKey = sf::Key::Multiply; break;
+    case WXK_NUMPAD_ADD:      sfKey = sf::Key::Add; break;
+    case WXK_NUMPAD_SUBTRACT: sfKey = sf::Key::Subtract; break;
+    case WXK_NUMPAD_DIVIDE:   sfKey = sf::Key::Divide; break;
+    case WXK_NUMPAD_ENTER:    sfKey = sf::Key::Return; break;
+//  case WXK_NUMPAD_SEPARATOR:sfKey = sf::Key::Separator; break;
+    case WXK_F1:              sfKey = sf::Key::F1; break;
+    case WXK_F2:              sfKey = sf::Key::F2; break;
+    case WXK_F3:              sfKey = sf::Key::F3; break;
+    case WXK_F4:              sfKey = sf::Key::F4; break;
+    case WXK_F5:              sfKey = sf::Key::F5; break;
+    case WXK_F6:              sfKey = sf::Key::F6; break;
+    case WXK_F7:              sfKey = sf::Key::F7; break;
+    case WXK_F8:              sfKey = sf::Key::F8; break;
+    case WXK_F9:              sfKey = sf::Key::F9; break;
+    case WXK_F10:             sfKey = sf::Key::F10; break;
+    case WXK_F11:             sfKey = sf::Key::F11; break;
+    case WXK_F12:             sfKey = sf::Key::F12; break;
+    case WXK_F13:             sfKey = sf::Key::F13; break;
+    case WXK_F14:             sfKey = sf::Key::F14; break;
+    case WXK_F15:             sfKey = sf::Key::F15; break;
+//  case WXK_NUMLOCK:         sfKey = sf::Key::Num_Lock; break;
+//  case WXK_SCROLL:          sfKey = sf::Key::Scroll_Lock; break;
+    default:                  sfKey = id <= 255 ? id : 0;
     }
 
     return sfKey;
@@ -165,73 +165,71 @@ void EventHandler::SFKeyToString(unsigned int keycode, char *keyStr) {
     case sf::Key::Num7 = '7': sprintf(keyStr, "UP"); break;
     case sf::Key::Num8 = '8': sprintf(keyStr, "UP"); break;
     case sf::Key::Num9 = '9': sprintf(keyStr, "UP"); break;*/ 
-    case sf::Key::Escape: sprintf(keyStr, "Escape"); break;
-    case sf::Key::LControl: sprintf(keyStr, "LControl"); break;
-    case sf::Key::LShift: sprintf(keyStr, "LShift"); break;
-    case sf::Key::LAlt: sprintf(keyStr, "LAlt"); break;
-    case sf::Key::LSystem: sprintf(keyStr, "LSystem"); break;
-    case sf::Key::RControl: sprintf(keyStr, "RControl"); break;
-    case sf::Key::RShift: sprintf(keyStr, "RShift"); break;
-    case sf::Key::RAlt: sprintf(keyStr, "RAlt"); break;
-    case sf::Key::RSystem: sprintf(keyStr, "RSystem"); break;
-    case sf::Key::Menu: sprintf(keyStr, "Menu"); break;
-    case sf::Key::LBracket: sprintf(keyStr, "LBracket"); break;
-    case sf::Key::RBracket: sprintf(keyStr, "RBracket"); break;
-    case sf::Key::SemiColon: sprintf(keyStr, ";"); break;
-    case sf::Key::Comma: sprintf(keyStr, ","); break;
-    case sf::Key::Period: sprintf(keyStr, "."); break;
-    case sf::Key::Quote: sprintf(keyStr, "\'"); break;
-    case sf::Key::Slash: sprintf(keyStr, "/"); break;
-    case sf::Key::BackSlash: sprintf(keyStr, "\\"); break;
-    case sf::Key::Tilde: sprintf(keyStr, "~"); break;
-    case sf::Key::Equal: sprintf(keyStr, "="); break;
-    case sf::Key::Dash: sprintf(keyStr, "-"); break;
-    case sf::Key::Space: sprintf(keyStr, "Space"); break;
-    case sf::Key::Return: sprintf(keyStr, "Return"); break;
-    case sf::Key::Back: sprintf(keyStr, "Back"); break;
-    case sf::Key::Tab: sprintf(keyStr, "Tab"); break;
-    case sf::Key::PageUp: sprintf(keyStr, "Page Up"); break;
-    case sf::Key::PageDown: sprintf(keyStr, "Page Down"); break;
-    case sf::Key::End: sprintf(keyStr, "End"); break;
-    case sf::Key::Home: sprintf(keyStr, "Home"); break;
-    case sf::Key::Insert: sprintf(keyStr, "Insert"); break;
-    case sf::Key::Delete: sprintf(keyStr, "Delete"); break;
-    case sf::Key::Add: sprintf(keyStr, "+"); break;
-    case sf::Key::Subtract: sprintf(keyStr, "-"); break;
-    case sf::Key::Multiply: sprintf(keyStr, "*"); break;
-    case sf::Key::Divide: sprintf(keyStr, "/"); break;
-    case sf::Key::Left: sprintf(keyStr, "Left"); break;
-    case sf::Key::Right: sprintf(keyStr, "Right"); break;
-    case sf::Key::Up: sprintf(keyStr, "UP"); break;
-    case sf::Key::Down: sprintf(keyStr, "Down"); break;
-    case sf::Key::Numpad0: sprintf(keyStr, "NP 0"); break;
-    case sf::Key::Numpad1: sprintf(keyStr, "NP 1"); break;
-    case sf::Key::Numpad2: sprintf(keyStr, "NP 2"); break;
-    case sf::Key::Numpad3: sprintf(keyStr, "NP 3"); break;
-    case sf::Key::Numpad4: sprintf(keyStr, "NP 4"); break;
-    case sf::Key::Numpad5: sprintf(keyStr, "NP 5"); break;
-    case sf::Key::Numpad6: sprintf(keyStr, "NP 6"); break;
-    case sf::Key::Numpad7: sprintf(keyStr, "NP 7"); break;
-    case sf::Key::Numpad8: sprintf(keyStr, "NP 8"); break;
-    case sf::Key::Numpad9: sprintf(keyStr, "NP 9"); break;
-    case sf::Key::F1: sprintf(keyStr, "F1"); break;
-    case sf::Key::F2: sprintf(keyStr, "F2"); break;
-    case sf::Key::F3: sprintf(keyStr, "F3"); break;
-    case sf::Key::F4: sprintf(keyStr, "F4"); break;
-    case sf::Key::F5: sprintf(keyStr, "F5"); break;
-    case sf::Key::F6: sprintf(keyStr, "F6"); break;
-    case sf::Key::F7: sprintf(keyStr, "F7"); break;
-    case sf::Key::F8: sprintf(keyStr, "F8"); break;
-    case sf::Key::F9: sprintf(keyStr, "F9"); break;
-    case sf::Key::F10: sprintf(keyStr, "F10"); break;
-    case sf::Key::F11: sprintf(keyStr, "F11"); break;
-    case sf::Key::F12: sprintf(keyStr, "F12"); break;
-    case sf::Key::F13: sprintf(keyStr, "F13"); break;
-    case sf::Key::F14: sprintf(keyStr, "F14"); break;
-    case sf::Key::F15: sprintf(keyStr, "F15"); break;
-    case sf::Key::Pause: sprintf(keyStr, "Paues"); break;
-	
-    default:
-	sprintf(keyStr, "%c", keycode);
+    case sf::Key::Escape:      sprintf(keyStr, "Escape"); break;
+    case sf::Key::LControl:    sprintf(keyStr, "LControl"); break;
+    case sf::Key::LShift:      sprintf(keyStr, "LShift"); break;
+    case sf::Key::LAlt:        sprintf(keyStr, "LAlt"); break;
+    case sf::Key::LSystem:     sprintf(keyStr, "LSystem"); break;
+    case sf::Key::RControl:    sprintf(keyStr, "RControl"); break;
+    case sf::Key::RShift:      sprintf(keyStr, "RShift"); break;
+    case sf::Key::RAlt:        sprintf(keyStr, "RAlt"); break;
+    case sf::Key::RSystem:     sprintf(keyStr, "RSystem"); break;
+    case sf::Key::Menu:        sprintf(keyStr, "Menu"); break;
+    case sf::Key::LBracket:    sprintf(keyStr, "LBracket"); break;
+    case sf::Key::RBracket:    sprintf(keyStr, "RBracket"); break;
+    case sf::Key::SemiColon:   sprintf(keyStr, ";"); break;
+    case sf::Key::Comma:       sprintf(keyStr, ","); break;
+    case sf::Key::Period:      sprintf(keyStr, "."); break;
+    case sf::Key::Quote:       sprintf(keyStr, "\'"); break;
+    case sf::Key::Slash:       sprintf(keyStr, "/"); break;
+    case sf::Key::BackSlash:   sprintf(keyStr, "\\"); break;
+    case sf::Key::Tilde:       sprintf(keyStr, "~"); break;
+    case sf::Key::Equal:       sprintf(keyStr, "="); break;
+    case sf::Key::Dash:        sprintf(keyStr, "-"); break;
+    case sf::Key::Space:       sprintf(keyStr, "Space"); break;
+    case sf::Key::Return:      sprintf(keyStr, "Return"); break;
+    case sf::Key::Back:        sprintf(keyStr, "Back"); break;
+    case sf::Key::Tab:         sprintf(keyStr, "Tab"); break;
+    case sf::Key::PageUp:      sprintf(keyStr, "Page Up"); break;
+    case sf::Key::PageDown:    sprintf(keyStr, "Page Down"); break;
+    case sf::Key::End:         sprintf(keyStr, "End"); break;
+    case sf::Key::Home:        sprintf(keyStr, "Home"); break;
+    case sf::Key::Insert:      sprintf(keyStr, "Insert"); break;
+    case sf::Key::Delete:      sprintf(keyStr, "Delete"); break;
+    case sf::Key::Add:         sprintf(keyStr, "+"); break;
+    case sf::Key::Subtract:    sprintf(keyStr, "-"); break;
+    case sf::Key::Multiply:    sprintf(keyStr, "*"); break;
+    case sf::Key::Divide:      sprintf(keyStr, "/"); break;
+    case sf::Key::Left:        sprintf(keyStr, "Left"); break;
+    case sf::Key::Right:       sprintf(keyStr, "Right"); break;
+    case sf::Key::Up:          sprintf(keyStr, "UP"); break;
+    case sf::Key::Down:        sprintf(keyStr, "Down"); break;
+    case sf::Key::Numpad0:     sprintf(keyStr, "NP 0"); break;
+    case sf::Key::Numpad1:     sprintf(keyStr, "NP 1"); break;
+    case sf::Key::Numpad2:     sprintf(keyStr, "NP 2"); break;
+    case sf::Key::Numpad3:     sprintf(keyStr, "NP 3"); break;
+    case sf::Key::Numpad4:     sprintf(keyStr, "NP 4"); break;
+    case sf::Key::Numpad5:     sprintf(keyStr, "NP 5"); break;
+    case sf::Key::Numpad6:     sprintf(keyStr, "NP 6"); break;
+    case sf::Key::Numpad7:     sprintf(keyStr, "NP 7"); break;
+    case sf::Key::Numpad8:     sprintf(keyStr, "NP 8"); break;
+    case sf::Key::Numpad9:     sprintf(keyStr, "NP 9"); break;
+    case sf::Key::F1:          sprintf(keyStr, "F1"); break;
+    case sf::Key::F2:          sprintf(keyStr, "F2"); break;
+    case sf::Key::F3:          sprintf(keyStr, "F3"); break;
+    case sf::Key::F4:          sprintf(keyStr, "F4"); break;
+    case sf::Key::F5:          sprintf(keyStr, "F5"); break;
+    case sf::Key::F6:          sprintf(keyStr, "F6"); break;
+    case sf::Key::F7:          sprintf(keyStr, "F7"); break;
+    case sf::Key::F8:          sprintf(keyStr, "F8"); break;
+    case sf::Key::F9:          sprintf(keyStr, "F9"); break;
+    case sf::Key::F10:         sprintf(keyStr, "F10"); break;
+    case sf::Key::F11:         sprintf(keyStr, "F11"); break;
+    case sf::Key::F12:         sprintf(keyStr, "F12"); break;
+    case sf::Key::F13:         sprintf(keyStr, "F13"); break;
+    case sf::Key::F14:         sprintf(keyStr, "F14"); break;
+    case sf::Key::F15:         sprintf(keyStr, "F15"); break;
+    case sf::Key::Pause:       sprintf(keyStr, "Paues"); break;
+    default:                   sprintf(keyStr, "%c", keycode);
     }
 }
diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript
index 8a03a814e8..c8a8577394 100644
--- a/Source/Core/Core/Src/SConscript
+++ b/Source/Core/Core/Src/SConscript
@@ -103,4 +103,6 @@ libs = [
 	'bdisasm'
 	]
 
-env.StaticLibrary("core", files, LIBS=libs)
+env_core = env.Clone();
+env_core.Append(CXXFLAGS = [ '-fPIC' ])
+env_core.StaticLibrary("core", files, LIBS=libs)
diff --git a/Source/Plugins/Plugin_PadSimpleEvnt/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_PadSimpleEvnt/Src/GUI/ConfigDlg.cpp
index 916652129a..8a95c371a8 100644
--- a/Source/Plugins/Plugin_PadSimpleEvnt/Src/GUI/ConfigDlg.cpp
+++ b/Source/Plugins/Plugin_PadSimpleEvnt/Src/GUI/ConfigDlg.cpp
@@ -192,18 +192,20 @@ void ConfigDialog::OnClose(wxCloseEvent& event)
 
 void ConfigDialog::OnKeyDown(wxKeyEvent& event)
 {
-	if(clickedButton != NULL)
-	{
-		int page = m_Notebook->GetSelection();
+    if(clickedButton != NULL) {
+	int page = m_Notebook->GetSelection();
+	
+	int sfcode = EventHandler::wxCharCodeWXToSF(event.GetKeyCode());
+	char sfstr[100];
+	EventHandler::SFKeyToString(sfcode, sfstr);
 
-		pad[page].keyForControl[clickedButton->GetId()] = 
-		    EventHandler::wxCharCodeWXToSF(event.GetKeyCode());
-		clickedButton->SetLabel(wxString::Format(_T("%c"), event.GetKeyCode()));
-		clickedButton->Disconnect();
-	}
-
-	clickedButton = NULL;
-	event.Skip();
+	pad[page].keyForControl[clickedButton->GetId()] = sfcode;	
+	clickedButton->SetLabel(wxString::FromAscii(sfstr));
+	clickedButton->Disconnect();
+    }
+    
+    clickedButton = NULL;
+    event.Skip();
 }
 
 void ConfigDialog::OnCloseClick(wxCommandEvent& event)
diff --git a/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.cpp
index 533c83bb5d..9a06244fdf 100644
--- a/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.cpp
+++ b/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.cpp
@@ -331,7 +331,7 @@ void LoadConfig()
 	};
 
 	IniFile file;
-	file.Load(FULL_CONFIG_DIR "pad.ini");
+	file.Load(FULL_CONFIG_DIR EPAD_CONFIG_FILE);
 
 	for(int i = 0; i < 4; i++) {
 	    char SectionName[32];
@@ -351,7 +351,7 @@ void LoadConfig()
 void SaveConfig()
 {
 	IniFile file;
-	file.Load(FULL_CONFIG_DIR "pad.ini");
+	file.Load(FULL_CONFIG_DIR EPAD_CONFIG_FILE);
 
 	for(int i = 0; i < 4; i++)
 	{
@@ -366,7 +366,7 @@ void SaveConfig()
 			file.Set(SectionName, controlNames[x], pad[i].keyForControl[x]);
 		}
 	}
-	file.Save(FULL_CONFIG_DIR "pad.ini");
+	file.Save(FULL_CONFIG_DIR EPAD_CONFIG_FILE);
 }
 
 
diff --git a/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.h b/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.h
index d3cc727698..8afa399eee 100644
--- a/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.h
+++ b/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.h
@@ -19,6 +19,7 @@
 #define __PADSIMPLE_H__  
 
 #include "EventHandler.h"
+#define EPAD_CONFIG_FILE "epad.ini"
 // Controls
 enum
 {