Tiny fix for Netplay window to display SJIS game titles correctly.

Do not scan device where emulator is already running 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4745 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
ayuanx
2009-12-29 13:38:34 +00:00
parent bd5d4cd34e
commit 7816bc6900
2 changed files with 8 additions and 6 deletions

View File

@ -168,11 +168,13 @@ void DllDebugger(HWND _hParent, bool Show) {}
void DllConfig(HWND _hParent)
{
// Load settings
g_Config.Load();
// We do a pad search before creating the dialog
WiiMoteEmu::Search_Devices(WiiMoteEmu::joyinfo, WiiMoteEmu::NumPads, WiiMoteEmu::NumGoodPads);
if (!g_EmulatorRunning)
{
// Load settings
g_Config.Load();
// We do a pad search before creating the dialog
WiiMoteEmu::Search_Devices(WiiMoteEmu::joyinfo, WiiMoteEmu::NumPads, WiiMoteEmu::NumGoodPads);
}
#if defined(HAVE_WX) && HAVE_WX