From 5183107d79c031233e29dd394676853c50f6adb0 Mon Sep 17 00:00:00 2001
From: sunsets <845944018@qq.com>
Date: Mon, 1 Apr 2024 15:10:24 +0800
Subject: [PATCH] Fixed a bug that would cause sending to fail

---
 src/slic3r/GUI/Plater.cpp           | 4 ++--
 src/slic3r/GUI/PrintHostDialogs.cpp | 5 ++++-
 src/slic3r/GUI/PrintHostDialogs.hpp | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 114beff..eabf0c6 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -7978,7 +7978,7 @@ void Plater::send_gcode()
                 wxGetApp().preset_bundle->printers.get_edited_preset().config.opt_string("printer_notes"));
         }
 
-        //B53
+       //B53 //B62
         auto pppd = dlg.pppd();
         auto checkbox_states = dlg.checkbox_states();
         for (int i = 0; i < pppd.size(); i++) {
@@ -7987,7 +7987,7 @@ void Plater::send_gcode()
                 auto          m_collection  = &preset_bundle.printers;
                 auto          preset_data   = pppd[i];
 
-                Preset *preset = m_collection->find_preset((preset_data.name).ToStdString());
+               Preset *preset = m_collection->find_preset(preset_data.preset_name);
                 if (!preset || !preset->is_visible)
                     continue;
                 wxStringTokenizer tokenizer((preset_data.fullname), "*");
diff --git a/src/slic3r/GUI/PrintHostDialogs.cpp b/src/slic3r/GUI/PrintHostDialogs.cpp
index d3093c2..97eb101 100644
--- a/src/slic3r/GUI/PrintHostDialogs.cpp
+++ b/src/slic3r/GUI/PrintHostDialogs.cpp
@@ -81,8 +81,11 @@ PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, PrintHostPostUplo
         for (const std::string &preset_name : it->get_preset_names()) {
             Preset *preset = wxGetApp().preset_bundle->printers.find_preset(preset_name);
             if (preset != nullptr) {
+                //B62
                 preset_data.push_back({wxString::FromUTF8(it->get_full_name(preset_name)).Lower(), wxString::FromUTF8(preset_name),
-                                       wxString::FromUTF8(it->get_full_name(preset_name)), ph_printers.is_selected(it, preset_name)});
+                        wxString::FromUTF8(it->get_full_name(preset_name)), ph_printers.is_selected(it, preset_name),
+                        preset_name
+                });
             }
         }
     }
diff --git a/src/slic3r/GUI/PrintHostDialogs.hpp b/src/slic3r/GUI/PrintHostDialogs.hpp
index 8274956..90cf797 100644
--- a/src/slic3r/GUI/PrintHostDialogs.hpp
+++ b/src/slic3r/GUI/PrintHostDialogs.hpp
@@ -23,13 +23,14 @@ namespace Slic3r {
 
 namespace GUI {
 
-//B53
+//B53 //B62
 struct PhysicalPrinterPresetData
 {
     wxString lower_name; // just for sorting
     wxString name;       // preset_name
     wxString fullname;   // full name
     bool     selected;   // is selected
+    std::string preset_name;
     int      checkboxId;
 };
 class PrintHostSendDialog : public GUI::MsgDialog