From b0656fefbe3fcfc79cbaabe304da0f6d2216b0ac Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Wed, 2 Jul 2025 19:29:24 +0800 Subject: [PATCH] ENH:Protect the bitmap jira: STUDIO-13044 Change-Id: I12ae5c8508fadd76f2dd3efd8d95c1547133a634 (cherry picked from commit 3ab0610b90fe17580b09d1edf538afd6bcf14b6e) --- src/slic3r/GUI/Widgets/ComboBox.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Widgets/ComboBox.cpp b/src/slic3r/GUI/Widgets/ComboBox.cpp index 919ec029cb..400033fb21 100644 --- a/src/slic3r/GUI/Widgets/ComboBox.cpp +++ b/src/slic3r/GUI/Widgets/ComboBox.cpp @@ -192,7 +192,10 @@ bool ComboBox::SetFont(wxFont const& font) int ComboBox::Append(const wxString &item, const wxBitmap &bitmap, int style) { - return Append(item, bitmap, nullptr, style); + if (bitmap.IsOk()) { + return Append(item, bitmap, nullptr, style); + } + return Append(item, wxNullBitmap, nullptr, style); } int ComboBox::Append(const wxString &text, @@ -200,7 +203,10 @@ int ComboBox::Append(const wxString &text, void * clientData, int style) { - return Append(text, bitmap, wxString{}, clientData, style); + if (bitmap.IsOk()) { + return Append(text, bitmap, wxString{}, clientData, style); + } + return Append(text, wxNullBitmap, wxString{}, clientData, style); } int ComboBox::Append(const wxString &text, const wxBitmap &bitmap, const wxString &group, void *clientData, int style)