fix merge

This commit is contained in:
remi durand 2021-02-22 14:43:04 +01:00
parent a50b4cd544
commit 01a311572f

View File

@ -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)));