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-3619] avoid quick play/stop when switch to device

Browse source 
Change-Id: I957dc1e06e227a721824fe1448bdb5b6a57cbe7e
This commit is contained in:
chunmao.guo 2023-07-10 15:16:08 +08:00 • committed by Lane.Wei
parent 3f71c21771
commit 86bd65f096
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -115,7 +115,7 @@ void MediaPlayCtrl::SetMachineObject(MachineObject* obj)
if (m_last_state != MEDIASTATE_IDLE) if (m_last_state != MEDIASTATE_IDLE)
Stop(" "); Stop(" ");
if (m_next_retry.IsValid()) // Try open 2 seconds later, to avoid state conflict if (m_next_retry.IsValid()) // Try open 2 seconds later, to avoid state conflict
m_next_retry = wxDateTime::Now() + wxTimeSpan::Seconds(2 * m_failed_retry); m_next_retry = wxDateTime::Now() + wxTimeSpan::Seconds(2);
else else
SetStatus("", false); SetStatus("", false);
} }
@ -193,7 +193,7 @@ void MediaPlayCtrl::Play()
if (!m_remote_support) { // not support tutk if (!m_remote_support) { // not support tutk
Stop(m_lan_ip.empty() Stop(m_lan_ip.empty()
? _L("Initialize failed (Missing LAN ip of printer)!") ? _L("Initialize failed (Missing LAN ip of printer)!")
: wxString()); : _L("Initialize failed (Not supported on the current printer version)!"));
return; return;
} }
@ -285,7 +285,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 && (!m_remote_support || m_lan_mode) && (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;
@ -477,6 +477,8 @@ void MediaPlayCtrl::on_show_hide(wxShowEvent &evt)
evt.Skip(); evt.Skip();
if (m_isBeingDeleted) return; if (m_isBeingDeleted) return;
m_failed_retry = 0; m_failed_retry = 0;
if (m_next_retry.IsValid()) // Try open 2 seconds later, to avoid quick play/stop
m_next_retry = wxDateTime::Now() + wxTimeSpan::Seconds(2);
IsShownOnScreen() ? Play() : Stop(); IsShownOnScreen() ? Play() : Stop();
} }