From 3dc94b6f12d44ad631200e86bb382b351bebae2b Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Thu, 18 May 2023 12:27:16 +0800 Subject: [PATCH] FIX: [STUDIO-2940] prefer use remote tunnel for liveview Change-Id: I23708989e6d5ab38724e5da2cff2fe9d648bf730 --- src/slic3r/GUI/DeviceManager.cpp | 2 +- src/slic3r/GUI/MediaFilePanel.cpp | 2 +- src/slic3r/GUI/MediaPlayCtrl.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 485b57cd4..2dc370dbd 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -2373,7 +2373,7 @@ bool MachineObject::is_camera_busy_off() int MachineObject::get_local_camera_proto() { - if (!is_function_supported(PrinterFunction::FUNC_REMOTE_TUNNEL)) return 0; + if (!is_function_supported(PrinterFunction::FUNC_LOCAL_TUNNEL)) return 0; return local_camera_proto; } diff --git a/src/slic3r/GUI/MediaFilePanel.cpp b/src/slic3r/GUI/MediaFilePanel.cpp index 5c42b7eac..9f118023d 100644 --- a/src/slic3r/GUI/MediaFilePanel.cpp +++ b/src/slic3r/GUI/MediaFilePanel.cpp @@ -411,7 +411,7 @@ void MediaFilePanel::fetchUrl(boost::weak_ptr wfs) return; } m_waiting_enable = false; - if (m_local_support && !m_lan_ip.empty()) { + if ((m_lan_mode || !m_remote_support) && m_local_support && !m_lan_ip.empty()) { std::string url = "bambu:///local/" + m_lan_ip + ".?port=6000&user=" + m_lan_user + "&passwd=" + m_lan_passwd; fs->SetUrl(url); return; diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp index b3d5647c2..afe62596b 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.cpp +++ b/src/slic3r/GUI/MediaPlayCtrl.cpp @@ -152,7 +152,7 @@ void MediaPlayCtrl::Play() NetworkAgent *agent = wxGetApp().getAgent(); std::string agent_version = agent ? agent->get_version() : ""; - if (m_lan_proto && !m_disable_lan && !m_lan_ip.empty() && (!m_lan_mode || !m_lan_passwd.empty())) { + if (m_lan_proto && (m_lan_mode ||!m_remote_support) && !m_disable_lan && !m_lan_ip.empty()) { m_disable_lan = m_remote_support && !m_lan_mode; // try remote next time if (m_lan_proto == 1) m_url = "bambu:///local/" + m_lan_ip + ".?port=6000&user=" + m_lan_user + "&passwd=" + m_lan_passwd + "&device=" + m_machine + "&version=" + agent_version;