piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2244 from lioncash/find

Browse Source 
DolphinWX/Common: Change some find_first_of usages to find
This commit is contained in:
skidau
2015-03-30 21:07:42 +11:00
parent d42d5699b5 eacf741051
commit 008200db4d
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -767,8 +767,10 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event))
if (OpenISO->IsWiiDisc())
{
int partitionNum = wxAtoi(File.Mid(File.find_first_of("/") - 1, 1));
File.erase(0, File.find_first_of("/") + 1); // Remove "Partition x/"
size_t slash_index = File.find('/');
int partitionNum = wxAtoi(File.Mid(slash_index - 1, 1));
File.erase(0, slash_index + 1); // Remove "Partition x/"
WiiDisc.at(partitionNum).FileSystem->ExportFile(WxStrToStr(File), WxStrToStr(Path));
}
else
@ -900,8 +902,10 @@ void CISOProperties::OnExtractDir(wxCommandEvent& event)
if (OpenISO->IsWiiDisc())
{
int partitionNum = wxAtoi(Directory.Mid(Directory.find_first_of("/") - 1, 1));
Directory.erase(0, Directory.find_first_of("/") + 1); // Remove "Partition x/"
size_t slash_index = Directory.find('/');
int partitionNum = wxAtoi(Directory.Mid(slash_index - 1, 1));
Directory.erase(0, slash_index + 1); // Remove "Partition x/"
ExportDir(WxStrToStr(Directory), WxStrToStr(Path), partitionNum);
}
else