summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-02-22 00:57:55 +0100
committerGitHub <noreply@github.com>2023-02-22 00:57:55 +0100
commitba05301e1b91086d9286bd6cef99423ef409f0e6 (patch)
treefff7e208e4fcdf0d956660e98696f89d13a6bf59
parentMerge pull request #9843 from MonsterDruide1/network-connreset (diff)
parentexternals: Update cpp-httplib to latest (diff)
downloadyuzu-ba05301e1b91086d9286bd6cef99423ef409f0e6.tar
yuzu-ba05301e1b91086d9286bd6cef99423ef409f0e6.tar.gz
yuzu-ba05301e1b91086d9286bd6cef99423ef409f0e6.tar.bz2
yuzu-ba05301e1b91086d9286bd6cef99423ef409f0e6.tar.lz
yuzu-ba05301e1b91086d9286bd6cef99423ef409f0e6.tar.xz
yuzu-ba05301e1b91086d9286bd6cef99423ef409f0e6.tar.zst
yuzu-ba05301e1b91086d9286bd6cef99423ef409f0e6.zip
-rw-r--r--CMakeLists.txt2
m---------externals/cpp-httplib0
-rw-r--r--src/web_service/web_backend.cpp2
-rw-r--r--src/yuzu/discord_impl.cpp2
4 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8896fe0be..10a3de9e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,7 +241,7 @@ endif()
if (ENABLE_WEB_SERVICE)
find_package(cpp-jwt 1.4 CONFIG)
- find_package(httplib 0.11 MODULE)
+ find_package(httplib 0.12 MODULE)
endif()
if (YUZU_TESTS)
diff --git a/externals/cpp-httplib b/externals/cpp-httplib
-Subproject 305a7abcb9b4e9e349843c6d563212e6c1bbbf2
+Subproject 6d963fbe8d415399d65e94db7910bbd22fe3741
diff --git a/src/web_service/web_backend.cpp b/src/web_service/web_backend.cpp
index 12a7e4922..dff380cca 100644
--- a/src/web_service/web_backend.cpp
+++ b/src/web_service/web_backend.cpp
@@ -71,7 +71,7 @@ struct Client::Impl {
const std::string& jwt_ = "", const std::string& username_ = "",
const std::string& token_ = "") {
if (cli == nullptr) {
- cli = std::make_unique<httplib::Client>(host.c_str());
+ cli = std::make_unique<httplib::Client>(host);
}
if (!cli->is_valid()) {
diff --git a/src/yuzu/discord_impl.cpp b/src/yuzu/discord_impl.cpp
index de0c307d4..978ffef33 100644
--- a/src/yuzu/discord_impl.cpp
+++ b/src/yuzu/discord_impl.cpp
@@ -76,7 +76,7 @@ void DiscordImpl::Update() {
// New Check for game cover
httplib::Client cli(game_cover_url);
- if (auto res = cli.Head(fmt::format("/images/game/boxart/{}.png", icon_name).c_str())) {
+ if (auto res = cli.Head(fmt::format("/images/game/boxart/{}.png", icon_name))) {
if (res->status == 200) {
game_cover_url += fmt::format("/images/game/boxart/{}.png", icon_name);
} else {