The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 15:49:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Plugins/Plugin_nJoy_SDL/Src/config.cpp
View File

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

5
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
View File

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