From c1fa2acd8514cc4a76a0475e6fa5d990b9b29453 Mon Sep 17 00:00:00 2001
From: "weiting.ji" <weiting.ji@bambulab.com>
Date: Tue, 22 Jul 2025 16:05:17 +0800
Subject: [PATCH] FIX: client crash when select other setting in the
 comparator's right combobox

Jira: STUDIO-13491
Change-Id: I2ca85b2e176de0748317ccd97576d1f052bbbc39
(cherry picked from commit ae8df0f31c1f26278635cf0b270572d8a00319a7)
---
 src/slic3r/GUI/UnsavedChangesDialog.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp
index 91f78f2c4b..d5dea0a645 100644
--- a/src/slic3r/GUI/UnsavedChangesDialog.cpp
+++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp
@@ -1191,8 +1191,9 @@ static size_t get_id_from_opt_key(std::string opt_key)
 static wxString get_full_label(std::string opt_key, const DynamicPrintConfig& config)
 {
     opt_key = get_pure_opt_key(opt_key);
+    auto option = config.option(opt_key);
 
-    if (config.option(opt_key)->is_nil())
+    if (!option || option->is_nil())
         return _L("N/A");
 
     const ConfigOptionDef* opt = config.def()->get(opt_key);