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

FIX: crash in ubuntu when doing group

Browse Source 
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ib69be6fdc18918c9d9ae0c840b7dfa6bd4977365
(cherry picked from commit 55f79b273790ff25b2bde5b07011ef9bb4760c4a)
This commit is contained in:
xun.zhang
2025-04-01 16:27:38 +08:00
committed by Noisyfox
parent f3c11288f6
commit 057b85f8a2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/DragDropPanel.cpp
View File

@@ -8,7 +8,7 @@ struct CustomData
{ {
int filament_id; int filament_id;
unsigned char r, g, b, a; unsigned char r, g, b, a;
std::string type; char type[64];
}; };
@@ -39,7 +39,6 @@ public:
ColorDataObject(const wxColour &color = *wxBLACK, int filament_id = 0, const std::string &type = "PLA") ColorDataObject(const wxColour &color = *wxBLACK, int filament_id = 0, const std::string &type = "PLA")
: wxCustomDataObject(wxDataFormat("application/customize_format")) : wxCustomDataObject(wxDataFormat("application/customize_format"))
{ {
std::memset(&m_data, 0, sizeof(m_data));
set_custom_data_filament_id(filament_id); set_custom_data_filament_id(filament_id);
set_custom_data_color(color); set_custom_data_color(color);
set_custom_data_type(type); set_custom_data_type(type);
@@ -55,7 +54,8 @@ public:
void SetType(const std::string &type) { set_custom_data_type(type); } void SetType(const std::string &type) { set_custom_data_type(type); }
void set_custom_data_type(const std::string& type) { void set_custom_data_type(const std::string& type) {
m_data.type = type; std::strncpy(m_data.type, type.c_str(), sizeof(m_data.type) - 1);
m_data.type[sizeof(m_data.type) - 1] = '\0';
} }
void set_custom_data_filament_id(int filament_id) { void set_custom_data_filament_id(int filament_id) {