From 7a0d4ac990ed8605a22092d3e3e4a633ddb22da9 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sun, 18 Nov 2018 14:25:18 -0600 Subject: [PATCH] ramifications of Settings being a pointer instead of a reference. --- src/GUI/Plater/PresetChooser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GUI/Plater/PresetChooser.cpp b/src/GUI/Plater/PresetChooser.cpp index f07bc6480..45a9cd3fe 100644 --- a/src/GUI/Plater/PresetChooser.cpp +++ b/src/GUI/Plater/PresetChooser.cpp @@ -58,7 +58,7 @@ void PresetChooser::load(std::array presets) { } // # Read the current defaults from the settings file - const auto& settings_defaults {_settings.default_presets.at(get_preset(group))}; + const auto& settings_defaults {_settings->default_presets.at(get_preset(group))}; size_t i {0}; std::vector preset_names {}; @@ -128,7 +128,7 @@ bool PresetChooser::select_preset_by_name(wxString name, wxBitmapComboBox* choos } void PresetChooser::_update_preset_settings(preset_t preset) { - auto& settings_presets {_settings.default_presets.at(get_preset(preset))}; + auto& settings_presets {_settings->default_presets.at(get_preset(preset))}; settings_presets.clear(); // make sure previous contents are deconstructed settings_presets = this->_get_selected_presets(preset); @@ -138,7 +138,7 @@ void PresetChooser::_on_select_preset(preset_t preset) { // update settings store this->_update_preset_settings(preset); // save settings - _settings.save_settings(); + _settings->save_settings(); if (preset == preset_t::Printer) { this->load(); // reload print/filament settings to honor compatible printers }