diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-02-13 19:04:27 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-02-13 19:04:27 +1300 |
| commit | 88526be3b5cfc33436d4390935d7982c4795520a (patch) | |
| tree | 9108ff1a4192985a050ff82dc59bdaa45571deff /Source/Core/DolphinWX/Android/ButtonManager.cpp | |
| parent | ec0d717eea41daff5f72f6c9df24acf02db505b6 (diff) | |
| parent | 3fe05e0a9f6908c1cf9a3caad6bff1d8decf04a3 (diff) | |
Merge pull request #50 from Parlane/inifile_tidy
Fix IniFile to use string& instead of char*
Diffstat (limited to 'Source/Core/DolphinWX/Android/ButtonManager.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Android/ButtonManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp index f451d64412..5c71a7197a 100644 --- a/Source/Core/DolphinWX/Android/ButtonManager.cpp +++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp @@ -101,7 +101,7 @@ namespace ButtonManager bool hasbind = false; char modifier = 0; std::string value; - ini.Get("Android", config.str().c_str(), &value, "None"); + ini.Get("Android", config.str(), &value, "None"); if (value == "None") continue; if (std::string::npos != value.find("Axis")) |