From 01a311572f24a7a0362637c3423b2de2d3256b8b Mon Sep 17 00:00:00 2001
From: remi durand <remi-j.durand@thalesgroup.com>
Date: Mon, 22 Feb 2021 14:43:04 +0100
Subject: [PATCH] fix merge

---
 src/slic3r/GUI/Tab.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 27631775e..48b019a29 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -1777,9 +1777,9 @@ bool Tab::create_pages(std::string setting_type_name, int idx_page)
 
             if (!in_line) {
                 if (colored) {
-                    m_colored_Label_colors[setting_id] = &m_default_text_clr;
+                    m_colored_Label_colors[setting_id] = m_default_text_clr;
                     Line l = current_group->create_single_option_line(option, label_path.empty() ? wxString(wxEmptyString) : wxString(label_path));
-                    l.full_Label_color = m_colored_Label_colors[setting_id];
+                    l.full_Label_color = &m_colored_Label_colors[setting_id];
                     current_group->append_line(l);
                 } else {
                     current_group->append_line(current_group->create_single_option_line(option, label_path.empty() ? wxString(wxEmptyString) : wxString(label_path)));