From 7816bc6900e77c0f9584b4013a13e315596e58e2 Mon Sep 17 00:00:00 2001 From: ayuanx Date: Tue, 29 Dec 2009 13:38:34 +0000 Subject: [PATCH] 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 --- Source/Core/DolphinWX/Src/NetWindow.cpp | 2 +- Source/Plugins/Plugin_Wiimote/Src/main.cpp | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 6cbb9167b3..191ac98bc3 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -170,7 +170,7 @@ void NetPlay::DrawGUI() if (str_end == (int)std::string::npos || buffer.size() < 1) 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)")); diff --git a/Source/Plugins/Plugin_Wiimote/Src/main.cpp b/Source/Plugins/Plugin_Wiimote/Src/main.cpp index cd82294e4f..a707235431 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/main.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/main.cpp @@ -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