3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-24 23:23:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix bbl cloud connection and camera issue

Browse source
This commit is contained in:
SoftFever 2023-08-23 20:48:58 +08:00
parent de4e34ec01
commit 2aefba2cf5
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/slic3r/GUI/GUI_App.cpp
View file

@ -1168,17 +1168,17 @@ void GUI_App::post_init()
CallAfter([this] {
bool cw_showed = this->config_wizard_startup();
// std::string http_url = get_http_url(app_config->get_country_code());
// std::string language = GUI::into_u8(current_language_code());
// std::string network_ver = Slic3r::NetworkAgent::get_version();
// bool sys_preset = app_config->get("sync_system_preset") == "true";
// this->preset_updater->sync(http_url, language, network_ver, sys_preset ? preset_bundle : nullptr);
std::string http_url = get_http_url(app_config->get_country_code());
std::string language = GUI::into_u8(current_language_code());
std::string network_ver = Slic3r::NetworkAgent::get_version();
bool sys_preset = app_config->get("sync_system_preset") == "true";
this->preset_updater->sync(http_url, language, network_ver, sys_preset ? preset_bundle : nullptr);
//BBS: check new version
this->check_new_version_sf();
//BBS: check privacy version
// if (is_user_login())
// this->check_privacy_version(0);
if (is_user_login() && app_config->get("stealth_mode") == "false") {
// this->check_privacy_version(0);
request_user_handle(0);
}
});
}
@ -2489,8 +2489,6 @@ 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);
copy_network_if_available();
on_init_network();

2
src/slic3r/GUI/MediaPlayCtrl.cpp
View file

@ -253,7 +253,7 @@ void MediaPlayCtrl::Stop(wxString const &msg)
m_last_failed_code = m_failed_code;
++m_failed_retry;
if (m_failed_code != 0 && !m_tutk_support && (m_failed_retry > 1 || m_user_triggered)) {
if (m_failed_code != 0 && (m_failed_retry > 1 || m_user_triggered)) {
m_next_retry = wxDateTime(); // stop retry
if (wxGetApp().show_modal_ip_address_enter_dialog(_L("LAN Connection Failed (Failed to start liveview)"))) {
m_failed_retry = 0;