From 1d1b1f0715e88d555ef384371a3c79a8739e3a44 Mon Sep 17 00:00:00 2001
From: supermerill <merill@free.fr>
Date: Mon, 7 Sep 2020 09:21:46 +0200
Subject: [PATCH] #442 fix "cooling" setting not completely nuked

---
 src/libslic3r/GCode.cpp               |  2 +-
 src/libslic3r/GCode/CoolingBuffer.cpp |  2 +-
 src/slic3r/GUI/Preset.cpp             | 14 +++++++++-----
 src/slic3r/GUI/Tab.cpp                |  3 +--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 59a2e125b..4d33b0134 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -1456,7 +1456,7 @@ void GCode::_do_export(Print &print, FILE *file)
     this->print_machine_envelope(file, print);
 
     // Disable fan.
-    if ( (! print.config().cooling.get_at(initial_extruder_id) || print.config().disable_fan_first_layers.get_at(initial_extruder_id))
+    if ( print.config().disable_fan_first_layers.get_at(initial_extruder_id)
         && config().gcode_flavor != gcfKlipper)
         _write(file, m_writer.set_fan(0, true));
 
diff --git a/src/libslic3r/GCode/CoolingBuffer.cpp b/src/libslic3r/GCode/CoolingBuffer.cpp
index 236941e26..faef66485 100644
--- a/src/libslic3r/GCode/CoolingBuffer.cpp
+++ b/src/libslic3r/GCode/CoolingBuffer.cpp
@@ -312,7 +312,7 @@ std::vector<PerExtruderAdjustments> CoolingBuffer::parse_layer_gcode(const std::
         PerExtruderAdjustments &adj         = per_extruder_adjustments[i];
         uint16_t            extruder_id = extruders[i].id();
         adj.extruder_id               = extruder_id;
-        adj.cooling_slow_down_enabled = config.cooling.get_at(extruder_id);
+        adj.cooling_slow_down_enabled = config.slowdown_below_layer_time.get_at(extruder_id) > 0;
         adj.slowdown_below_layer_time = float(config.slowdown_below_layer_time.get_at(extruder_id));
         adj.min_print_speed           = float(config.min_print_speed.get_at(extruder_id));
         adj.max_speed_reduction       = float(config.max_speed_reduction.get_at(extruder_id) / 100);
diff --git a/src/slic3r/GUI/Preset.cpp b/src/slic3r/GUI/Preset.cpp
index 4a70e61e7..08f6aa383 100644
--- a/src/slic3r/GUI/Preset.cpp
+++ b/src/slic3r/GUI/Preset.cpp
@@ -572,11 +572,15 @@ const std::vector<std::string>& Preset::filament_options()
         "filament_toolchange_part_fan_speed",
         "filament_dip_insertion_speed",
         "filament_dip_extraction_speed",  //skinnydip params end
-        "temperature", "first_layer_temperature", "bed_temperature", "first_layer_bed_temperature", "fan_always_on", "cooling", "min_fan_speed",
-        "max_fan_speed", "bridge_fan_speed"
-        , "top_fan_speed"
-        , "disable_fan_first_layers"
-        , "fan_below_layer_time", 
+        "temperature", "first_layer_temperature", "bed_temperature", "first_layer_bed_temperature", 
+        "cooling",
+        "fan_always_on", 
+        "min_fan_speed",
+        "max_fan_speed", 
+        "bridge_fan_speed",
+        "top_fan_speed",
+        "disable_fan_first_layers",
+        "fan_below_layer_time", 
         "slowdown_below_layer_time",
         "max_speed_reduction",
         "min_print_speed",
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index d34271098..20505677f 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -1889,8 +1889,7 @@ void TabFilament::update()
     this->update_volumetric_flow_preset_hints();
     Layout();
 
-    bool cooling = m_config->opt_bool("cooling", 0);
-    bool fan_always_on = cooling || m_config->opt_bool("fan_always_on", 0);
+    bool fan_always_on = m_config->opt_bool("fan_always_on", 0);
 
     //get_field("max_fan_speed")->toggle(m_config->opt_int("fan_below_layer_time", 0) > 0);
     Field* min_print_speed_field = get_field("min_print_speed");