mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: use safe language code for http 

Change-Id: Id1f4927308350ee35b891a5352cbf1e2d0c2577e
Github: 3655
This commit is contained in:
chunmao.guo 2024-03-01 10:49:34 +08:00 committed by Lane.Wei
parent baebced77a
commit c467c8068b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/GUI_App.cpp
View File

@ -2290,7 +2290,7 @@ std::map<std::string, std::string> GUI_App::get_extra_header()
extra_headers.insert(std::make_pair("X-BBL-OS-Version", os_version)); extra_headers.insert(std::make_pair("X-BBL-OS-Version", os_version));
if (app_config) if (app_config)
extra_headers.insert(std::make_pair("X-BBL-Device-ID", app_config->get("slicer_uuid"))); extra_headers.insert(std::make_pair("X-BBL-Device-ID", app_config->get("slicer_uuid")));
extra_headers.insert(std::make_pair("X-BBL-Language", convert_studio_language_to_api(app_config->get("language")))); extra_headers.insert(std::make_pair("X-BBL-Language", convert_studio_language_to_api(into_u8(current_language_code_safe()))));
return extra_headers; return extra_headers;
} }
@ -2447,9 +2447,6 @@ bool GUI_App::on_init_inner()
d->EndModal(wxID_ABORT); d->EndModal(wxID_ABORT);
}); });
std::map<std::string, std::string> extra_headers = get_extra_header();
Slic3r::Http::set_extra_headers(extra_headers);
// Verify resources path // Verify resources path
const wxString resources_dir = from_u8(Slic3r::resources_dir()); const wxString resources_dir = from_u8(Slic3r::resources_dir());
wxCHECK_MSG(wxDirExists(resources_dir), false, wxCHECK_MSG(wxDirExists(resources_dir), false,
@ -2712,6 +2709,10 @@ bool GUI_App::on_init_inner()
Bind(EVT_SHOW_IP_DIALOG, &GUI_App::show_ip_address_enter_dialog_handler, this); Bind(EVT_SHOW_IP_DIALOG, &GUI_App::show_ip_address_enter_dialog_handler, this);
std::map<std::string, std::string> extra_headers = get_extra_header();
Slic3r::Http::set_extra_headers(extra_headers);
copy_network_if_available(); copy_network_if_available();
on_init_network(); on_init_network();