diff options
Diffstat (limited to 'src/yuzu_cmd')
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index c42d98709..0d25ff400 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -259,7 +259,7 @@ void Config::ReadValues() { | |||
| 259 | std::stringstream ss(title_list); | 259 | std::stringstream ss(title_list); |
| 260 | std::string line; | 260 | std::string line; |
| 261 | while (std::getline(ss, line, '|')) { | 261 | while (std::getline(ss, line, '|')) { |
| 262 | const auto title_id = std::stoul(line, nullptr, 16); | 262 | const auto title_id = std::strtoul(line.c_str(), nullptr, 16); |
| 263 | const auto disabled_list = sdl2_config->Get("AddOns", "disabled_" + line, ""); | 263 | const auto disabled_list = sdl2_config->Get("AddOns", "disabled_" + line, ""); |
| 264 | 264 | ||
| 265 | std::stringstream inner_ss(disabled_list); | 265 | std::stringstream inner_ss(disabled_list); |
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 55d0938f7..087cfaa26 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -264,8 +264,9 @@ int main(int argc, char** argv) { | |||
| 264 | nickname = match[1]; | 264 | nickname = match[1]; |
| 265 | password = match[2]; | 265 | password = match[2]; |
| 266 | address = match[3]; | 266 | address = match[3]; |
| 267 | if (!match[4].str().empty()) | 267 | if (!match[4].str().empty()) { |
| 268 | port = static_cast<u16>(std::stoi(match[4])); | 268 | port = static_cast<u16>(std::strtoul(match[4].str().c_str(), nullptr, 0)); |
| 269 | } | ||
| 269 | std::regex nickname_re("^[a-zA-Z0-9._\\- ]+$"); | 270 | std::regex nickname_re("^[a-zA-Z0-9._\\- ]+$"); |
| 270 | if (!std::regex_match(nickname, nickname_re)) { | 271 | if (!std::regex_match(nickname, nickname_re)) { |
| 271 | std::cout | 272 | std::cout |