From e68daa36c9fda4dbfa7d65d3d4692634ce8f14b5 Mon Sep 17 00:00:00 2001
From: "haolin.tian" <haolin.tian@bambulab.com>
Date: Tue, 5 Aug 2025 20:05:16 +0800
Subject: [PATCH] FIX: use actual printer_type when connecting with
 ip&access_code

jira: [STUDIO-13841]
Change-Id: Iff594cd1f6dcd5c6485ab0aa67c98f422a75fd6c
(cherry picked from commit f8d0f62a1b3f3379de40a3b845c06fe61d907d82)
---
 src/slic3r/GUI/DeviceCore/DevManager.cpp | 9 +++++++--
 src/slic3r/GUI/DeviceCore/DevManager.h   | 4 +++-
 src/slic3r/GUI/ReleaseNote.cpp           | 4 +++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/slic3r/GUI/DeviceCore/DevManager.cpp b/src/slic3r/GUI/DeviceCore/DevManager.cpp
index f3d6dac53e..115e989885 100644
--- a/src/slic3r/GUI/DeviceCore/DevManager.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevManager.cpp
@@ -314,7 +314,9 @@ namespace Slic3r
         }
     }
 
-    MachineObject* DeviceManager::insert_local_device(const BBLocalMachine& machine, std::string connection_type, std::string bind_state, std::string version, std::string access_code)
+    MachineObject* DeviceManager::insert_local_device(const BBLocalMachine& machine,
+        std::string connection_type, std::string bind_state,
+        std::string version, std::string access_code)
     {
         MachineObject* obj;
         auto           it = localMachineList.find(machine.dev_id);
@@ -324,7 +326,10 @@ namespace Slic3r
             obj = new MachineObject(this, m_agent, machine.dev_name, machine.dev_id, machine.dev_ip);
             localMachineList.insert(std::make_pair(machine.dev_id, obj));
         }
-        obj->printer_type = _parse_printer_type(machine.printer_type);
+        if (machine.printer_type.empty())
+            obj->printer_type = _parse_printer_type("C11");
+        else
+            obj->printer_type = _parse_printer_type(machine.printer_type);
         obj->dev_connection_type = connection_type == "farm" ? "lan":connection_type;
         obj->bind_state          = connection_type == "farm" ? "free":bind_state;
         obj->bind_sec_link = "secure";
diff --git a/src/slic3r/GUI/DeviceCore/DevManager.h b/src/slic3r/GUI/DeviceCore/DevManager.h
index 0679b18579..6f04037b0e 100644
--- a/src/slic3r/GUI/DeviceCore/DevManager.h
+++ b/src/slic3r/GUI/DeviceCore/DevManager.h
@@ -100,7 +100,9 @@ private:
     /*TODO*/
 public:
     // to remove
-    MachineObject* insert_local_device(const BBLocalMachine& machine, std::string connection_type, std::string bind_state, std::string version, std::string access_code);
+    MachineObject* insert_local_device(const BBLocalMachine& machine,
+        std::string connection_type, std::string bind_state, std::string version,
+        std::string access_code);
     static void update_local_machine(const MachineObject& m);
 };
 
diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp
index 9791a1e4c4..1febc6c5b2 100644
--- a/src/slic3r/GUI/ReleaseNote.cpp
+++ b/src/slic3r/GUI/ReleaseNote.cpp
@@ -2105,7 +2105,9 @@ void InputIpAddressDialog::workerThreadFunc(std::string str_ip, std::string str_
         machine.dev_ip = str_ip;
         machine.dev_id = detectData.dev_id;
         machine.printer_type = detectData.model_id;
-        m_obj = dev->insert_local_device(machine, detectData.connect_type, detectData.bind_state, detectData.version, str_access_code);
+        m_obj = dev->insert_local_device(machine,
+            detectData.connect_type, detectData.bind_state, detectData.version,
+            str_access_code);
 
 
         if (w.expired()) return;