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

FIX: liveview local missing ip dialog not show 

Change-Id: Ie15bdf0ac20354aecb2e0dffe9471e12e0143aa9
This commit is contained in:
chunmao.guo 2024-06-21 19:55:51 +08:00 committed by Lane.Wei
parent a2fb749b2d
commit 4d7715cc11
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/MediaPlayCtrl.cpp
View File

@ -288,7 +288,6 @@ void MediaPlayCtrl::Play()
return; return;
} }
m_button_play->SetIcon("media_stop");
NetworkAgent *agent = wxGetApp().getAgent(); NetworkAgent *agent = wxGetApp().getAgent();
std::string agent_version = agent ? agent->get_version() : ""; std::string agent_version = agent ? agent->get_version() : "";
if (m_lan_proto > MachineObject::LVL_Disable && (m_lan_mode || !m_remote_support) && !m_disable_lan && !m_lan_ip.empty()) { if (m_lan_proto > MachineObject::LVL_Disable && (m_lan_mode || !m_remote_support) && !m_disable_lan && !m_lan_ip.empty()) {
@ -308,6 +307,7 @@ void MediaPlayCtrl::Play()
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: " << hide_passwd(hide_id_middle_string(url, url.find(m_lan_ip), m_lan_ip.length()), {m_lan_passwd}); BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: " << hide_passwd(hide_id_middle_string(url, url.find(m_lan_ip), m_lan_ip.length()), {m_lan_passwd});
m_url = url; m_url = url;
load(); load();
m_button_play->SetIcon("media_stop");
return; return;
} }
@ -420,7 +420,7 @@ void MediaPlayCtrl::Stop(wxString const &msg)
} }
auto tunnel = m_url.empty() ? "" : into_u8(wxURI(m_url).GetPath()).substr(1); auto tunnel = m_url.empty() ? "" : into_u8(wxURI(m_url).GetPath()).substr(1);
if (auto n = tunnel.find_first_of('/_'); n != std::string::npos) if (auto n = tunnel.find_first_of("/_"); n != std::string::npos)
tunnel = tunnel.substr(0, n); tunnel = tunnel.substr(0, n);
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()
@ -658,7 +658,7 @@ void MediaPlayCtrl::onStateChanged(wxMediaEvent &event)
j["result"] = "success"; j["result"] = "success";
j["code"] = 0; j["code"] = 0;
auto tunnel = into_u8(wxURI(m_url).GetPath()).substr(1); auto tunnel = into_u8(wxURI(m_url).GetPath()).substr(1);
if (auto n = tunnel.find_first_of('/_'); n != std::string::npos) if (auto n = tunnel.find_first_of("/_"); n != std::string::npos)
tunnel = tunnel.substr(0, n); tunnel = tunnel.substr(0, n);
j["tunnel"] = tunnel; j["tunnel"] = tunnel;
if (tunnel == "tutk") { if (tunnel == "tutk") {