From ce0a4b7acebf4be9e525f34ba3d0b9d68885d4e8 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Mon, 11 Dec 2023 08:58:00 +0800 Subject: [PATCH] ENH: do not cancel printing job when timeout JIRA: STUDIO-5009 Change-Id: I067470173acc26d7ecd8ceb6f0e04ac7f03e3a4d Signed-off-by: Stone Li (cherry picked from commit 7ab5817c7229c5179adca026ffacb97c2affd292) --- src/slic3r/GUI/Jobs/PrintJob.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/Jobs/PrintJob.cpp b/src/slic3r/GUI/Jobs/PrintJob.cpp index 186f031f5..fa437c651 100644 --- a/src/slic3r/GUI/Jobs/PrintJob.cpp +++ b/src/slic3r/GUI/Jobs/PrintJob.cpp @@ -30,7 +30,8 @@ static wxString sending_over_lan_str = _L("Sending print job over LAN"); static wxString sending_over_cloud_str = _L("Sending print job through cloud service"); static wxString wait_sending_finish = _L("Print task sending times out."); -static wxString desc_wait_sending_finish = _L("The printer timed out while receiving a print job. Please check if the network is functioning properly and send the print again."); +//static wxString desc_wait_sending_finish = _L("The printer timed out while receiving a print job. Please check if the network is functioning properly and send the print again."); +static wxString desc_wait_sending_finish = _L("The printer timed out while receiving a print job. Please check if the network is functioning properly."); PrintJob::PrintJob(std::shared_ptr pri, Plater* plater, std::string dev_id) : PlaterJob{ std::move(pri), plater }, @@ -447,8 +448,9 @@ void PrintJob::process() m_plater->update_print_error_info(BAMBU_NETWORK_ERR_TIMEOUT, wait_sending_finish.ToStdString(), desc_wait_sending_finish.ToStdString()); BOOST_LOG_TRIVIAL(info) << "print_job: timeout, cancel the job" << obj->job_id_; /* handle tiemout */ - obj->command_task_cancel(curr_job_id); - return false; + //obj->command_task_cancel(curr_job_id); + //return false; + return true; } BOOST_LOG_TRIVIAL(info) << "print_job: obj is null"; return true;