From 3124aa803c851051169936ae3caa5f22e52f2897 Mon Sep 17 00:00:00 2001 From: daco65 Date: Sun, 16 Aug 2009 14:13:25 +0000 Subject: [PATCH] NETPLAY: just some minor clean up. also, apparently netplay already works to public(since 4003) ip's (internet) but not private or loopback (lan or 2 clients on 1 pc) . git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4006 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/NetFunctions.cpp | 2 +- Source/Core/DolphinWX/Src/NetWindow.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/Src/NetFunctions.cpp b/Source/Core/DolphinWX/Src/NetFunctions.cpp index 4c30cce255..3a49805a47 100644 --- a/Source/Core/DolphinWX/Src/NetFunctions.cpp +++ b/Source/Core/DolphinWX/Src/NetFunctions.cpp @@ -414,7 +414,7 @@ void NetPlay::ChangeSelectedGame(std::string game) m_selectedGame = game; UpdateNetWindow(false); - m_Logging->AppendText(wxString::Format(wxT("*Game has been changed to : %s\n"), game.c_str())); + m_Logging->AppendText(wxString::Format( wxT(" *Game has been changed to : %s \r\n "), wxString(game.c_str(),wxConvUTF8 ))); NOTICE_LOG(NETPLAY,"Game has been changed to : %s \n",game.c_str()); } } diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 67ac41413f..f311659a28 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -360,7 +360,7 @@ void NetPlay::UpdateNetWindow(bool update_infos, wxString infos) { m_critical.Enter(); //m_Game_str->SetLabel(wxString::Format(wxT(" Game : %s"), m_selectedGame.c_str())); - m_Game_str->SetLabel(wxString::FromAscii( ( wxT( "Game %s"), m_selectedGame.c_str() ))); + m_Game_str->SetLabel(wxString::FromUTF8( ( wxT( "Game %s"), m_selectedGame.c_str() ))); m_critical.Leave(); } } @@ -547,7 +547,7 @@ void GameListPopup::OnButtons(wxCommandEvent& event) { case wxID_OK: if (m_GameList->GetSelection()-1 != wxNOT_FOUND) - m_netParent->ChangeSelectedGame(std::string(m_GameList_str[m_GameList->GetSelection()].mb_str())); + m_netParent->ChangeSelectedGame(std::string(m_GameList_str[m_GameList->GetSelection()-1].mb_str())); Destroy(); break; case wxID_CANCEL: