mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 22:00:39 -06:00
Switches to GCC's internal swaps for swap32 and swap64 in OSX. Changes CDIO from using char*** to std::vector<std::string>, which fixes a memory leak I was noticing and also makes it look cleaner. This is not tested much in Windows/Linux, please see if it compiles and doesn't fail out in some mysterious way
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5067 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -115,8 +115,9 @@ void CFrame::CreateMenu()
|
||||
m_pSubMenuDrive = fileMenu->AppendSubMenu(externalDrive, _T("&Boot from DVD Drive..."));
|
||||
|
||||
drives = cdio_get_devices();
|
||||
for (int i = 0; drives[i] != NULL && i < 24; i++) {
|
||||
externalDrive->Append(IDM_DRIVE1 + i, wxString::FromAscii(drives[i]));
|
||||
// Windows Limitation of 24 character drives
|
||||
for (int i = 0; i < drives.size() && i < 24; i++) {
|
||||
externalDrive->Append(IDM_DRIVE1 + i, wxString::FromAscii(drives[i].c_str()));
|
||||
}
|
||||
|
||||
fileMenu->AppendSeparator();
|
||||
@ -666,7 +667,7 @@ void CFrame::StartGame(const std::string& filename)
|
||||
|
||||
void CFrame::OnBootDrive(wxCommandEvent& event)
|
||||
{
|
||||
BootManager::BootCore(drives[event.GetId()-IDM_DRIVE1]);
|
||||
BootManager::BootCore(drives[event.GetId()-IDM_DRIVE1].c_str());
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user