From 97dcb7faeea14b3c0c28dad279d0385dedc75d6e Mon Sep 17 00:00:00 2001 From: wjyLearn <93930815+wjyLearn@users.noreply.github.com> Date: Mon, 22 Dec 2025 19:27:47 +0800 Subject: [PATCH] fix some bug --- src/slic3r/GUI/DeviceManager.cpp | 8 +++++++- src/slic3r/GUI/DeviceManager.hpp | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index f88de6c..b4f293b 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -505,6 +505,8 @@ void MachineObject::reload_printer_settings() MachineObject::MachineObject(std::string name) :dev_name(name) { + m_dev_info = DevInfo::Create(this); + m_dev_info->SetDevId(""); } // y40 @@ -518,6 +520,8 @@ MachineObject::MachineObject(std::string name, std::string url, std::string ip, slice_info(nullptr), m_is_online(false) { + m_dev_info = DevInfo::Create(this); + m_dev_info->SetDevId(""); } MachineObject::MachineObject(DeviceManager* manager, NetworkAgent* agent, std::string name, std::string id, std::string ip) @@ -779,7 +783,9 @@ std::string MachineObject::get_lifecycle_type_str() bool MachineObject::is_in_upgrading() const { - return m_upgrade->IsUpgrading(); + //y75 + //return m_upgrade->IsUpgrading(); + return false; } std::string MachineObject::get_ota_version() diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index e042423..a4f0370 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -100,10 +100,10 @@ private: std::shared_ptr m_token = std::make_shared(1); /* properties */ - std::string dev_name; - std::string dev_ip; - std::string access_code; - std::string user_access_code; + std::string dev_name = ""; + std::string dev_ip = ""; + std::string access_code = ""; + std::string user_access_code = ""; std::shared_ptr m_dev_info; // type, time stamp, delay