nJoy: minor fix, loading settings while game is running.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@62 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Laurence Muller 2008-07-23 09:05:59 +00:00
parent 1d175eadd7
commit 5955748d58
2 changed files with 7 additions and 2 deletions

View File

@ -520,11 +520,13 @@ void GetControllerAll(HWND hDlg, int controller)
void UpdateVisibleItems(HWND hDlg, int controllertype)
{
/*
if(controllertype == CTL_TYPE_KEYBOARD)
ComboBox_Enable(GetDlgItem(hDlg, IDC_JOYNAME), FALSE);
else
ComboBox_Enable(GetDlgItem(hDlg, IDC_JOYNAME), TRUE);
*/
if(controllertype)
{
// 4 extra buttons

View File

@ -90,9 +90,12 @@ void DllConfig(HWND _hParent)
return;
}
LoadConfig();
LoadConfig(); // load settings
if(OpenConfig(nJoy_hInst, _hParent))
{
SaveConfig();
}
LoadConfig(); // reload settings
}
// Init PAD (start emulation)