From 48d96e8e89d08902e0b3b911deaddd5f8b4ae249 Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Thu, 7 Sep 2023 16:26:52 +0800 Subject: [PATCH] FIX: [STUDIO-4347] fix local liveview test condition Change-Id: I524a4f5a7762c390aa5097f1ef8b6a95a2687c83 Jira: STUDIO-4347 (cherry picked from commit 7624c1f04d92019e8f62b61ab0430ebb7a8570f8) --- src/slic3r/GUI/MediaPlayCtrl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp index c7edab0331..91f643dc76 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.cpp +++ b/src/slic3r/GUI/MediaPlayCtrl.cpp @@ -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 && m_last_failed_codes.find(m_failed_code) == m_last_failed_codes.end() && (m_user_triggered || m_failed_retry > 3)) { @@ -273,7 +274,6 @@ void MediaPlayCtrl::Stop(wxString const &msg) j["result"] = "failed"; j["user_triggered"] = m_user_triggered; j["failed_retry"] = m_failed_retry; - bool remote = m_url.find("/local/") == wxString::npos; j["tunnel"] = remote ? "remote" : "local"; j["code"] = m_failed_code; if (remote) @@ -287,7 +287,7 @@ void MediaPlayCtrl::Stop(wxString const &msg) m_url.clear(); ++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 if (wxGetApp().show_modal_ip_address_enter_dialog(_L("LAN Connection Failed (Failed to start liveview)"))) { m_failed_retry = 0;