juli/OrcaSlicer
1
1 Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-19 05:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: login crash when network plugin is unavailable (#16438)

Browse Source 
* fix: login crash when network plugin is unavailable

* fix: directly use !config_version.empty() for the control block

* Use if/else for the empty plug-in version check

* Fix multi-device task list using a deleted network agent after plug-in reload

---------

Co-authored-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
Ian ChuaSoftFeverSoftFever
 authored and GitHub committed 2026-10-14 13:19:04 +08:00
1 parent 84768da6a1
commit 46b3871f8d
3 files changed
+76 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/slic3r/GUI/TaskManager.cpp
+12 -5
View File
@@ -171,6 +171,11 @@ TaskManager::TaskManager(NetworkAgent* agent)
;
}
void TaskManager::set_agent(NetworkAgent* agent)
{
m_agent = agent;
}
int TaskManager::start_print(const std::vector<PrintParams>& params, TaskSettings* settings)
{
@@ -240,17 +245,18 @@ int TaskManager::schedule(TaskStateInfo* task)
fire_lifecycle_event(LifecycleEvent::PrintJobStarted, start_ctx);
int result = -1;
if (!m_agent) {
NetworkAgent* agent = m_agent;
if (!agent) {
BOOST_LOG_TRIVIAL(trace) << "task_manager: NetworkAgent is nullptr";
}
else {
assert(m_agent);
assert(agent);
try {
// DEBUG FOR TEST
#if 0
result = start_print_test(task->get_params(), task->update_status_fn, task->cancel_fn, task->wait_fn);
#else
result = m_agent->start_print(task->get_params(), task->update_status_fn, task->cancel_fn, task->wait_fn);
result = agent->start_print(task->get_params(), task->update_status_fn, task->cancel_fn, task->wait_fn);
#endif
} catch (const std::exception& ex) {
BOOST_LOG_TRIVIAL(error) << "task_manager: start_print threw: " << ex.what();
@@ -363,12 +369,13 @@ std::map<int, TaskStateInfo*> TaskManager::get_local_task_list()
std::map<std::string, TaskStateInfo> TaskManager::get_task_list(int curr_page, int page_count, int& total)
{
std::map<std::string, TaskStateInfo> out;
if (m_agent) {
NetworkAgent* agent = m_agent;
if (agent) {
TaskQueryParams task_query_params;
task_query_params.limit = page_count;
task_query_params.offset = curr_page * page_count;
std::string task_info;
int result = m_agent->get_user_tasks(task_query_params, &task_info);
int result = agent->get_user_tasks(task_query_params, &task_info);
BOOST_LOG_TRIVIAL(trace) << "task_manager: get_task_list task_info=" << task_info;
if (result == 0) {
try {