diff options
| author | Glenn Rice <glennricster@gmail.com> | 2011-02-28 20:40:15 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2011-02-28 20:40:15 +0000 |
| commit | ba54fac9eb74be6f73e20e2de953cf6f355be57f (patch) | |
| tree | ee496d869da4f8a7026b94991fe33f560cb9851a /Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp | |
| parent | 1b8f4760247934e3bac649d45a887d304b5eb724 (diff) | |
Convert GetUserPath to return a std::string instead of a const char *. This simplifies its usage in most cases.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7265 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp index 86b0f12ec9..7442e5d294 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp @@ -48,11 +48,11 @@ void ReloadShader() bool ApplyShader() { - if (s_currentShader != std::string(File::GetUserPath(D_SHADERS_IDX)) + g_ActiveConfig.sPostProcessingShader + ".txt") + if (s_currentShader != File::GetUserPath(D_SHADERS_IDX) + g_ActiveConfig.sPostProcessingShader + ".txt") { // Set immediately to prevent endless recompiles on failure. if (!g_ActiveConfig.sPostProcessingShader.empty()) - s_currentShader = std::string(File::GetUserPath(D_SHADERS_IDX)) + g_ActiveConfig.sPostProcessingShader + ".txt"; + s_currentShader = File::GetUserPath(D_SHADERS_IDX) + g_ActiveConfig.sPostProcessingShader + ".txt"; else s_currentShader.clear(); |