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

FIX: [STUDIO-4347] fix local liveview test condition

Browse source 
Change-Id: I524a4f5a7762c390aa5097f1ef8b6a95a2687c83
Jira: STUDIO-4347
(cherry picked from commit 7624c1f04d92019e8f62b61ab0430ebb7a8570f8)
This commit is contained in:
chunmao.guo 2023-09-07 16:26:52 +08:00 • committed by Lane.Wei
parent 1f50a2a421
commit 48d96e8e89
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -263,6 +263,7 @@ void MediaPlayCtrl::Stop(wxString const &msg)
} }
bool remote = m_url.find("/local/") == wxString::npos && m_url.find("/rtsp") == wxString::npos;
if (last_state != wxMEDIASTATE_PLAYING && m_failed_code != 0 if (last_state != wxMEDIASTATE_PLAYING && m_failed_code != 0
&& m_last_failed_codes.find(m_failed_code) == m_last_failed_codes.end() && m_last_failed_codes.find(m_failed_code) == m_last_failed_codes.end()
&& (m_user_triggered || m_failed_retry > 3)) { && (m_user_triggered || m_failed_retry > 3)) {
@ -273,7 +274,6 @@ void MediaPlayCtrl::Stop(wxString const &msg)
j["result"] = "failed"; j["result"] = "failed";
j["user_triggered"] = m_user_triggered; j["user_triggered"] = m_user_triggered;
j["failed_retry"] = m_failed_retry; j["failed_retry"] = m_failed_retry;
bool remote = m_url.find("/local/") == wxString::npos;
j["tunnel"] = remote ? "remote" : "local"; j["tunnel"] = remote ? "remote" : "local";
j["code"] = m_failed_code; j["code"] = m_failed_code;
if (remote) if (remote)
@ -287,7 +287,7 @@ void MediaPlayCtrl::Stop(wxString const &msg)
m_url.clear(); m_url.clear();
++m_failed_retry; ++m_failed_retry;
if (m_failed_code < 0 && last_state != wxMEDIASTATE_PLAYING && (!m_remote_support || m_lan_mode) && (m_failed_retry > 1 || m_user_triggered)) { if (m_failed_code < 0 && last_state != wxMEDIASTATE_PLAYING && !remote && (m_failed_retry > 1 || m_user_triggered)) {
m_next_retry = wxDateTime(); // stop retry m_next_retry = wxDateTime(); // stop retry
if (wxGetApp().show_modal_ip_address_enter_dialog(_L("LAN Connection Failed (Failed to start liveview)"))) { if (wxGetApp().show_modal_ip_address_enter_dialog(_L("LAN Connection Failed (Failed to start liveview)"))) {
m_failed_retry = 0; m_failed_retry = 0;