diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-02-28 02:39:06 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2013-02-28 02:40:03 -0600 |
| commit | 03ec9a2e088b0818bf02a5bc2ffda4a512cba2b7 (patch) | |
| tree | cdc77e0e83145ee925baf0c8f404bdf894052c50 /Source/Core/DolphinWX/Src/ConfigMain.cpp | |
| parent | 56f09d3b91479deb0f3ae3c7ce623c7a4724e087 (diff) | |
Kill some unnecessary c_str and use StrToWxStr in a few places that I missed.
Diffstat (limited to 'Source/Core/DolphinWX/Src/ConfigMain.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/ConfigMain.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index bdb4cdc7fe..068501c432 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -982,9 +982,9 @@ void CConfigMain::AddAudioBackends() for (std::vector<std::string>::const_iterator iter = backends.begin(); iter != backends.end(); ++iter) { - BackendSelection->Append(StrToWxStr((*iter).c_str())); + BackendSelection->Append(StrToWxStr(*iter)); int num = BackendSelection->\ - FindString(StrToWxStr(SConfig::GetInstance().sBackend.c_str())); + FindString(StrToWxStr(SConfig::GetInstance().sBackend)); BackendSelection->SetSelection(num); } } @@ -1269,8 +1269,9 @@ void CConfigMain::ApploaderPathChanged(wxFileDirPickerEvent& WXUNUSED (event)) void CConfigMain::NANDRootChanged(wxFileDirPickerEvent& WXUNUSED (event)) { std::string NANDPath = - SConfig::GetInstance().m_NANDPath = File::GetUserPath(D_WIIROOT_IDX, WxStrToStr(NANDRoot->GetPath())); - NANDRoot->SetPath(wxString(NANDPath)); + SConfig::GetInstance().m_NANDPath = + File::GetUserPath(D_WIIROOT_IDX, WxStrToStr(NANDRoot->GetPath())); + NANDRoot->SetPath(StrToWxStr(NANDPath)); SConfig::GetInstance().m_SYSCONF->UpdateLocation(); DiscIO::cUIDsys::AccessInstance().UpdateLocation(); DiscIO::CSharedContent::AccessInstance().UpdateLocation(); |