From 830da1f8e490abd2b7ecf312d85759b8f2f5f8b6 Mon Sep 17 00:00:00 2001
From: bubnikv <bubnikv@gmail.com>
Date: Thu, 30 Nov 2017 13:43:02 +0100
Subject: [PATCH] Fixed a regression bug of handling the obsolete config
 parameters, causing crashes.

---
 xs/src/libslic3r/Config.cpp      | 2 +-
 xs/src/libslic3r/PrintConfig.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/xs/src/libslic3r/Config.cpp b/xs/src/libslic3r/Config.cpp
index d7671c82f..728ed608b 100644
--- a/xs/src/libslic3r/Config.cpp
+++ b/xs/src/libslic3r/Config.cpp
@@ -243,7 +243,7 @@ bool ConfigBase::set_deserialize_raw(const t_config_option_key &opt_key_src, con
         for (const auto &opt : def->options) {
             for (const t_config_option_key &opt_key2 : opt.second.aliases) {
                 if (opt_key2 == opt_key) {
-                    opt_key = opt_key2;
+                    opt_key = opt.first;
                     optdef = &opt.second;
                     break;
                 }
diff --git a/xs/src/libslic3r/PrintConfig.cpp b/xs/src/libslic3r/PrintConfig.cpp
index 217f9bdef..ed54d9b6c 100644
--- a/xs/src/libslic3r/PrintConfig.cpp
+++ b/xs/src/libslic3r/PrintConfig.cpp
@@ -245,6 +245,7 @@ PrintConfigDef::PrintConfigDef()
     def->enum_labels.push_back("Hilbert Curve");
     def->enum_labels.push_back("Archimedean Chords");
     def->enum_labels.push_back("Octagram Spiral");
+    // solid_fill_pattern is an obsolete equivalent to external_fill_pattern.
     def->aliases.push_back("solid_fill_pattern");
     def->default_value = new ConfigOptionEnum<InfillPattern>(ipRectilinear);