3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 10:17:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX: [STUDIO-1476] Media play ingore stop state when initing

Browse source 
Change-Id: Ie4c743be3fb1bdd095f627faed855bde57ef637a
This commit is contained in:
chunmao.guo 2022-11-28 13:59:52 +08:00 • committed by Lane.Wei
parent 2f7946333d
commit 38fb9dcec5
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -176,7 +176,7 @@ void MediaPlayCtrl::Play()
NetworkAgent* agent = wxGetApp().getAgent(); NetworkAgent* agent = wxGetApp().getAgent();
if (agent) { if (agent) {
agent->get_camera_url(m_machine, [this, m = m_machine](std::string url) { agent->get_camera_url(m_machine, [this, m = m_machine](std::string url) {
BOOST_LOG_TRIVIAL(info) << "camera_url: " << url; BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl camera_url: " << url << ", machine: " << m_machine;
CallAfter([this, m, url] { CallAfter([this, m, url] {
if (m != m_machine) return; if (m != m_machine) return;
m_url = url; m_url = url;
@ -195,6 +195,8 @@ void MediaPlayCtrl::Play()
m_tasks.push_back(m_url); m_tasks.push_back(m_url);
m_cond.notify_all(); m_cond.notify_all();
} }
} else {
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl drop late ttcode for state: " << m_last_state;
} }
}); });
}); });
@ -473,7 +475,7 @@ void MediaPlayCtrl::onStateChanged(wxMediaEvent& event)
return; return;
} }
} }
if (last_state == MEDIASTATE_IDLE && state == wxMEDIASTATE_STOPPED) { if ((last_state == MEDIASTATE_IDLE || last_state == MEDIASTATE_INITIALIZING) && state == wxMEDIASTATE_STOPPED) {
return; return;
} }
if ((last_state == wxMEDIASTATE_PAUSED || last_state == wxMEDIASTATE_PLAYING) && if ((last_state == wxMEDIASTATE_PAUSED || last_state == wxMEDIASTATE_PLAYING) &&