From bf7de71fd067932a567aeea7f7fc83438b877f15 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Fri, 10 Oct 2014 11:20:10 -0400 Subject: [PATCH] Replace wxFileExists() with File::Exists(). It did not handle unicode properly. --- Source/Core/DolphinWX/FrameTools.cpp | 6 +++--- Source/Core/DolphinWX/GameListCtrl.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 9c54986500ff..5159502d972d 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -624,14 +624,14 @@ void CFrame::BootGame(const std::string& filename) bootfile = m_GameListCtrl->GetSelectedISO()->GetFileName(); } else if (!StartUp.m_strDefaultGCM.empty() && - wxFileExists(wxSafeConvertMB2WX(StartUp.m_strDefaultGCM.c_str()))) + File::Exists(StartUp.m_strDefaultGCM)) { bootfile = StartUp.m_strDefaultGCM; } else { if (!SConfig::GetInstance().m_LastFilename.empty() && - wxFileExists(wxSafeConvertMB2WX(SConfig::GetInstance().m_LastFilename.c_str()))) + File::Exists(SConfig::GetInstance().m_LastFilename)) { bootfile = SConfig::GetInstance().m_LastFilename; } @@ -1782,7 +1782,7 @@ void CFrame::UpdateGUI() } // Prepare to load last selected file, enable play button else if (!SConfig::GetInstance().m_LastFilename.empty() && - wxFileExists(wxSafeConvertMB2WX(SConfig::GetInstance().m_LastFilename.c_str()))) + File::Exists(SConfig::GetInstance().m_LastFilename)) { if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, true); diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 71a62c665cc5..b801199d844b 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -1119,7 +1119,7 @@ void CGameListCtrl::CompressSelection(bool _compress) WxStrToStr(browseDialog.GetPath()), FileName); - if (wxFileExists(StrToWxStr(OutputFileName)) && + if (File::Exists(OutputFileName) && wxMessageBox( wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"), StrToWxStr(OutputFileName)), @@ -1147,7 +1147,7 @@ void CGameListCtrl::CompressSelection(bool _compress) WxStrToStr(browseDialog.GetPath()), FileName); - if (wxFileExists(StrToWxStr(OutputFileName)) && + if (File::Exists(OutputFileName) && wxMessageBox( wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"), StrToWxStr(OutputFileName)),