juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-02 15:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop the timelapse storage check when the send dialog closes

Browse Source
This commit is contained in:
SoftFever
2026-07-16 18:11:01 +08:00
parent 615deefa87
commit 3ec074edb2
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -471,6 +471,9 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
return; return;
} }
if (m_timelapse_check_timer)
m_timelapse_check_timer->Stop();
EndModal(wxID_CLOSE); EndModal(wxID_CLOSE);
Plater * plater = wxGetApp().plater(); Plater * plater = wxGetApp().plater();
wxCommandEvent evt(EVT_OPEN_FILAMENT_MAP_SETTINGS_DIALOG); wxCommandEvent evt(EVT_OPEN_FILAMENT_MAP_SETTINGS_DIALOG);
@@ -2178,6 +2181,9 @@ void SelectMachineDialog::on_cancel(wxCloseEvent &event)
if (m_mapping_popup.IsShown()) if (m_mapping_popup.IsShown())
m_mapping_popup.Dismiss(); m_mapping_popup.Dismiss();
if (m_timelapse_check_timer)
m_timelapse_check_timer->Stop();
m_worker->cancel_all(); m_worker->cancel_all();
this->EndModal(wxID_CANCEL); this->EndModal(wxID_CANCEL);
} }
@@ -3032,6 +3038,7 @@ void SelectMachineDialog::on_timelapse_storage_check_result()
void SelectMachineDialog::show_timelapse_storage_dialog(MachineObject* obj) void SelectMachineDialog::show_timelapse_storage_dialog(MachineObject* obj)
{ {
bool is_internal = (m_timelapse_storage == "internal"); bool is_internal = (m_timelapse_storage == "internal");
// file_count < 0 is the printer's "no video files" sentinel; 0 or more means files exist (0 also covers replies that omit the key).
bool has_video_files = obj->timelapse_storage_file_count >= 0; bool has_video_files = obj->timelapse_storage_file_count >= 0;
// internal: 2 buttons (Confirm & Print, Cancel Timelapse) // internal: 2 buttons (Confirm & Print, Cancel Timelapse)
// external + has files: 3 buttons (Confirm & Print, Cancel Timelapse, Clean Up) // external + has files: 3 buttons (Confirm & Print, Cancel Timelapse, Clean Up)
@@ -5866,6 +5873,9 @@ void SelectMachineDialog::show_init() {
SelectMachineDialog::~SelectMachineDialog() SelectMachineDialog::~SelectMachineDialog()
{ {
delete m_refresh_timer; delete m_refresh_timer;
if (m_timelapse_check_timer)
m_timelapse_check_timer->Stop();
delete m_timelapse_check_timer;
} }
void SelectMachineDialog::UpdateStatusCheckWarning_ExtensionTool(MachineObject* obj_) void SelectMachineDialog::UpdateStatusCheckWarning_ExtensionTool(MachineObject* obj_)