juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-16 13:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: stop the correct media controller

Browse Source
This commit is contained in:
Ian Chua
2026-09-16 18:44:06 +08:00
parent 803a2a3239
commit cf52c81dcd
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/MediaPlayCtrl.cpp
+3 -4
View File
@@ -554,8 +554,7 @@ void MediaPlayCtrl::StopWebStream()
void MediaPlayCtrl::Stop(wxString const &msg, wxString const &msg2) void MediaPlayCtrl::Stop(wxString const &msg, wxString const &msg2)
{ {
const bool webrtc_active = m_webrtc_ctrl && (m_last_mode == CameraStreamMode::webrtc || const bool webrtc_active = m_webrtc_ctrl && m_last_mode == CameraStreamMode::webrtc;
current_mode() == CameraStreamMode::webrtc);
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::Stop: last_state=" << m_last_state BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::Stop: last_state=" << m_last_state
<< " webrtc_active=" << webrtc_active << " failed_code=" << m_failed_code << " webrtc_active=" << webrtc_active << " failed_code=" << m_failed_code
<< " msg='" << msg.ToUTF8().data() << "'"; << " msg='" << msg.ToUTF8().data() << "'";
@@ -565,11 +564,11 @@ void MediaPlayCtrl::Stop(wxString const &msg, wxString const &msg2)
m_media_ctrl->EndExternalStream(); m_media_ctrl->EndExternalStream();
m_webrtc_stopping = false; m_webrtc_stopping = false;
} }
switch (current_mode()) { switch (m_last_mode) {
case CameraStreamMode::http: case CameraStreamMode::http:
case CameraStreamMode::https: case CameraStreamMode::https:
case CameraStreamMode::http_snapshot: { case CameraStreamMode::http_snapshot: {
const bool snapshot = current_mode() == CameraStreamMode::http_snapshot; const bool snapshot = m_last_mode == CameraStreamMode::http_snapshot;
if (m_last_state != MEDIASTATE_IDLE) { if (m_last_state != MEDIASTATE_IDLE) {
if (snapshot) { if (snapshot) {
if (m_web_ctrl) m_web_ctrl->Stop(); if (m_web_ctrl) m_web_ctrl->Stop();