piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 17:19:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a stupid error left by me.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4860 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
ayuanx
2010-01-16 22:37:38 +00:00
parent 4aeec95513
commit 734b0f5dd4
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Plugins/Plugin_Wiimote/Src/main.cpp
View File

@ -227,12 +227,12 @@ void Initialize(void *init)
WMdisplay = (Display*)g_WiimoteInitialize.hWnd;
#endif
// Load IR settings, as this is a per-game setting and the user might have loaded a different game
g_Config.LoadIR();
g_ISOId = g_WiimoteInitialize.ISOId;
DEBUG_LOG(WIIMOTE, "ISOId: %08x %s", g_WiimoteInitialize.ISOId, Hex2Ascii(g_WiimoteInitialize.ISOId).c_str());
// Load IR settings, as this is a per-game setting and the user might have loaded a different game
g_Config.LoadIR();
// Run this first so that WiiMoteReal::Initialize() overwrites g_Eeprom
WiiMoteEmu::Initialize();

1
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
View File

@ -791,6 +791,7 @@ void PADConfigDialognJoy::CreateGUIControls()
// Create objects for general settings 3
m_gGenSettingsID[i] = new wxStaticBoxSizer( wxVERTICAL, m_Controller[i], wxT("Settings") );
m_CBSaveByID[i] = new wxCheckBox(m_Controller[i], IDC_SAVEBYID, wxT("Save by ID"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
m_CBSaveByID[i]->Enable(false);
m_CBShowAdvanced[i] = new wxCheckBox(m_Controller[i], IDC_SHOWADVANCED, wxT("Show advanced settings"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
// Populate general settings 3