diff --git a/plugins/spu2-x/src/Linux/Config.cpp b/plugins/spu2-x/src/Linux/Config.cpp index 81c7579af5..87d470247f 100644 --- a/plugins/spu2-x/src/Linux/Config.cpp +++ b/plugins/spu2-x/src/Linux/Config.cpp @@ -130,7 +130,7 @@ void ReadSettings() #if SDL_MAJOR_VERSION >= 2 // YES It sucks ... for (int i = 0; i < SDL_GetNumAudioDrivers(); ++i) { - if (!temp.Cmp(SDL_GetAudioDriver(i))) + if (!temp.Cmp(wxString(SDL_GetAudioDriver(i), wxConvUTF8))) SdlOutputAPI = i; } #endif @@ -364,7 +364,7 @@ void DisplayDialog() if (gtk_combo_box_get_active(GTK_COMBO_BOX(sdl_api_box)) != -1) { SdlOutputAPI = gtk_combo_box_get_active(GTK_COMBO_BOX(sdl_api_box)); // YES It sucks ... - SDLOut->SetApiSettings(wxString(SDL_GetAudioDriver(SdlOutputAPI))); + SDLOut->SetApiSettings(wxString(SDL_GetAudioDriver(SdlOutputAPI), wxConvUTF8)); } #endif diff --git a/plugins/spu2-x/src/SndOut_SDL.cpp b/plugins/spu2-x/src/SndOut_SDL.cpp index c73b2ae1e6..246d192e16 100644 --- a/plugins/spu2-x/src/SndOut_SDL.cpp +++ b/plugins/spu2-x/src/SndOut_SDL.cpp @@ -133,19 +133,19 @@ struct SDLAudioMod : public SndOutModule { } void WriteSettings() const { - CfgWriteStr(L"SDL", L"HostApi", m_api); + CfgWriteStr(L"SDL", L"HostApi", wxString(m_api.c_str(), wxConvUTF8)); }; void SetApiSettings(wxString api) { #if SDL_MAJOR_VERSION >= 2 // Validate the api name bool valid = false; - std::string api_name = std::string(api); + std::string api_name = std::string(api.utf8_str()); for (int i = 0; i < SDL_GetNumAudioDrivers(); ++i) { valid |= (api_name.compare(SDL_GetAudioDriver(i)) == 0); } if (valid) { - m_api = api; + m_api = api.utf8_str(); } else { std::cerr << "SDL audio driver configuration is invalid!" << std::endl << "It will be replaced by pulseaudio!" << std::endl;