GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-16 17:35:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ramifications of Settings being a pointer instead of a reference.

Browse Source
This commit is contained in:
Joseph Lenox 2018-11-18 14:25:18 -06:00 committed by Joseph Lenox
parent 36336840ba
commit 7a0d4ac990
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GUI/Plater/PresetChooser.cpp
View File

@ -58,7 +58,7 @@ void PresetChooser::load(std::array<Presets, preset_types> presets) {
} }
// # Read the current defaults from the settings file // # 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}; size_t i {0};
std::vector<std::string> preset_names {}; std::vector<std::string> preset_names {};
@ -128,7 +128,7 @@ bool PresetChooser::select_preset_by_name(wxString name, wxBitmapComboBox* choos
} }
void PresetChooser::_update_preset_settings(preset_t preset) { 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.clear(); // make sure previous contents are deconstructed
settings_presets = this->_get_selected_presets(preset); settings_presets = this->_get_selected_presets(preset);
@ -138,7 +138,7 @@ void PresetChooser::_on_select_preset(preset_t preset) {
// update settings store // update settings store
this->_update_preset_settings(preset); this->_update_preset_settings(preset);
// save settings // save settings
_settings.save_settings(); _settings->save_settings();
if (preset == preset_t::Printer) { if (preset == preset_t::Printer) {
this->load(); // reload print/filament settings to honor compatible printers this->load(); // reload print/filament settings to honor compatible printers
} }