From ca32032654f69b403fa05b23c313bc3b01a801e6 Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Thu, 24 Aug 2023 17:16:10 +0800 Subject: [PATCH] FIX: [STUDIO-4207] fix tunnel mqtt not active Change-Id: I561eb164256a7eb811d1daec84ad7907d3caa01d Jira: STUDIO-4207 --- src/slic3r/GUI/DeviceManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 7db334064..abb8ca0e8 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -2543,7 +2543,6 @@ int MachineObject::parse_json(std::string payload) parse_msg_count++; std::chrono::system_clock::time_point clock_start = std::chrono::system_clock::now(); this->set_online_state(true); - if (m_active_state == NotActive) m_active_state = Active; std::chrono::system_clock::time_point curr_time = std::chrono::system_clock::now(); auto diff1 = std::chrono::duration_cast(curr_time - last_update_time); @@ -2562,6 +2561,7 @@ int MachineObject::parse_json(std::string payload) } if (j_pre.contains("print")) { + if (m_active_state == NotActive) m_active_state = Active; if (j_pre["print"].contains("command")) { if (j_pre["print"]["command"].get() == "push_status") { if (j_pre["print"].contains("msg")) { @@ -2642,7 +2642,7 @@ int MachineObject::parse_json(std::string payload) } } std::string version = parse_version(); - if (!version.empty() && print_json.load_compatible_settings("", version)) { + if (!version.empty() && print_json.load_compatible_settings(printer_type, version)) { // reload because compatible settings changed j.clear(); print_json.diff2all(json{}, j);