From d4d558ebee2323df3c6855fade17f3e748948071 Mon Sep 17 00:00:00 2001
From: Vojtech Bubnik <bubnikv@gmail.com>
Date: Mon, 6 Dec 2021 08:23:19 +0100
Subject: [PATCH] Fix of GCodeViewer crashes when opening app preferences #7430

---
 src/slic3r/GUI/Preferences.cpp | 30 ++++++++++++++++++------------
 src/slic3r/GUI/Preferences.hpp |  2 ++
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index 40ae0cb8c..6820a4284 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -9,7 +9,6 @@
 #include "Notebook.hpp"
 #include "ButtonsDescription.hpp"
 #include "OG_CustomCtrl.hpp"
-#include <initializer_list>
 
 namespace Slic3r {
 
@@ -519,21 +518,29 @@ void PreferencesDialog::build(size_t selected_tab)
 	this->CenterOnParent();
 }
 
-void PreferencesDialog::update_ctrls_alignment()
+std::vector<ConfigOptionsGroup*> PreferencesDialog::optgroups()
 {
-	int max_ctrl_width{ 0 };
-	std::initializer_list<ConfigOptionsGroup*> og_list = { m_optgroup_general.get(), m_optgroup_camera.get(), m_optgroup_gui.get() 
+	std::vector<ConfigOptionsGroup*> out;
+	out.reserve(4);
+	for (ConfigOptionsGroup* opt : { m_optgroup_general.get(), m_optgroup_camera.get(), m_optgroup_gui.get()
 #ifdef _WIN32
 		, m_optgroup_dark_mode.get()
 #endif // _WIN32
-	};
-	for (auto og : og_list) {
+		})
+		if (opt)
+			out.emplace_back(opt);
+	return out;
+}
+
+void PreferencesDialog::update_ctrls_alignment()
+{
+	int max_ctrl_width{ 0 };
+	for (ConfigOptionsGroup* og : this->optgroups())
 		if (int max = og->custom_ctrl->get_max_win_width();
 			max_ctrl_width < max)
 			max_ctrl_width = max;
-	}
 	if (max_ctrl_width)
-		for (auto og : og_list)
+		for (ConfigOptionsGroup* og : this->optgroups())
 			og->custom_ctrl->set_max_win_width(max_ctrl_width);
 }
 
@@ -622,9 +629,8 @@ void PreferencesDialog::accept(wxEvent&)
 
 void PreferencesDialog::on_dpi_changed(const wxRect &suggested_rect)
 {
-	m_optgroup_general->msw_rescale();
-	m_optgroup_camera->msw_rescale();
-	m_optgroup_gui->msw_rescale();
+	for (ConfigOptionsGroup* og : this->optgroups())
+		og->msw_rescale();
 
     msw_buttons_rescale(this, em_unit(), { wxID_OK, wxID_CANCEL });
 
@@ -788,7 +794,7 @@ void PreferencesDialog::init_highlighter(const t_config_option_key& opt_key)
 		});
 
 	std::pair<OG_CustomCtrl*, bool*> ctrl = { nullptr, nullptr };
-	for (auto opt_group : { m_optgroup_general, m_optgroup_camera, m_optgroup_gui }) {
+	for (ConfigOptionsGroup* opt_group : this->optgroups()) {
 		ctrl = opt_group->get_custom_ctrl_with_blinking_ptr(opt_key, -1);
 		if (ctrl.first && ctrl.second) {
 			m_highlighter.init(ctrl);
diff --git a/src/slic3r/GUI/Preferences.hpp b/src/slic3r/GUI/Preferences.hpp
index 210b04d4f..6c8012195 100644
--- a/src/slic3r/GUI/Preferences.hpp
+++ b/src/slic3r/GUI/Preferences.hpp
@@ -6,6 +6,7 @@
 
 #include <wx/dialog.h>
 #include <wx/timer.h>
+#include <vector>
 #include <map>
 
 class wxColourPickerCtrl;
@@ -61,6 +62,7 @@ protected:
     void create_settings_mode_widget();
     void create_settings_text_color_widget();
 	void init_highlighter(const t_config_option_key& opt_key);
+	std::vector<ConfigOptionsGroup*> optgroups();
 
 	struct PreferencesHighlighter
 	{