diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2017-12-07 15:16:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 15:16:39 +0100 |
| commit | 8a830074b64e0487afa523cd465de5ab40efb0a7 (patch) | |
| tree | 2c51deeb7f21c84b4ffb6e2e0394fe0d103ac4ae /Source/Core/Common/Config/Config.cpp | |
| parent | ecf30cfc749ff49697c8b6bf24efae4202a2bf61 (diff) | |
| parent | 05c8d229afc3d88f4c368a648e96b049ccd2fba3 (diff) | |
Merge pull request #6220 from leoetlino/utf8
WX: Fix argument parsing
Diffstat (limited to 'Source/Core/Common/Config/Config.cpp')
| -rw-r--r-- | Source/Core/Common/Config/Config.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/Common/Config/Config.cpp b/Source/Core/Common/Config/Config.cpp index a3504f80d2..342ef8ec6d 100644 --- a/Source/Core/Common/Config/Config.cpp +++ b/Source/Core/Common/Config/Config.cpp @@ -101,15 +101,14 @@ const std::string& GetSystemName(System system) return system_to_name.at(system); } -System GetSystemFromName(const std::string& name) +std::optional<System> GetSystemFromName(const std::string& name) { const auto system = std::find_if(system_to_name.begin(), system_to_name.end(), [&name](const auto& entry) { return entry.second == name; }); if (system != system_to_name.end()) return system->first; - _assert_msg_(COMMON, false, "Programming error! Couldn't convert '%s' to system!", name.c_str()); - return System::Main; + return {}; } const std::string& GetLayerName(LayerType layer) |
