GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-17 10:05:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bs_1.5.0.61' into SoftFever

Browse Source
This commit is contained in:
SoftFever 2023-03-15 22:29:41 +08:00
commit 25f2dd6ebb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/HttpServer.cpp
View File

@ -48,8 +48,8 @@ std::string http_headers::get_response()
std::string user_avatar; std::string user_avatar;
try { try {
json user_j = json::parse(http_body); json user_j = json::parse(http_body);
if (user_j.contains("uid")) if (user_j.contains("uidStr"))
user_id = std::to_string(user_j["uid"].get<int>()); user_id = user_j["uidStr"].get<std::string>();
if (user_j.contains("name")) if (user_j.contains("name"))
user_name = user_j["name"].get<std::string>(); user_name = user_j["name"].get<std::string>();
if (user_j.contains("avatar")) if (user_j.contains("avatar"))

2
version.inc
View File

@ -11,4 +11,4 @@ if(NOT DEFINED BBL_INTERNAL_TESTING)
set(BBL_INTERNAL_TESTING "1") set(BBL_INTERNAL_TESTING "1")
endif() endif()
set(SoftFever_VERSION "1.5.0") set(SoftFever_VERSION "1.5.0")
set(SLIC3R_VERSION "01.05.00.60") set(SLIC3R_VERSION "01.05.00.61")