piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6220 from leoetlino/utf8

Browse Source 
WX: Fix argument parsing
This commit is contained in:
Pierre Bourdon
2017-12-07 15:16:39 +01:00
committed by GitHub
parent ecf30cfc74 05c8d229af
commit 8a830074b6
6 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Common/Config/Config.cpp
View File

@ -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)

3
Source/Core/Common/Config/Config.h
View File

@ -7,6 +7,7 @@
#include <functional>
#include <map>
#include <memory>
#include <optional>
#include <string>
#include "Common/Config/ConfigInfo.h"
@ -38,7 +39,7 @@ void Shutdown();
void ClearCurrentRunLayer();
const std::string& GetSystemName(System system);
System GetSystemFromName(const std::string& system);
std::optional<System> GetSystemFromName(const std::string& system);
const std::string& GetLayerName(LayerType layer);
LayerType GetActiveLayerForConfig(const ConfigLocation&);