ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

2
Source/Core/DolphinWX/Src/NetWindow.cpp
View File

@ -170,7 +170,7 @@ void NetPlay::DrawGUI()
if (str_end == (int)std::string::npos || buffer.size() < 1) if (str_end == (int)std::string::npos || buffer.size() < 1)
break; // we reached the end of the string break; // we reached the end of the string
m_GameList_str.Add(wxString::FromAscii(buffer.c_str())); m_GameList_str.Add(wxString(buffer.c_str(), *wxConvCurrent));
} }
netmodes_str.Add(wxT("P2P Versus (2 players, faster)")); netmodes_str.Add(wxT("P2P Versus (2 players, faster)"));

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

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