From 493dec834b8e03924d518662ae923186e7cc49a4 Mon Sep 17 00:00:00 2001
From: supermerill <merill@free.fr>
Date: Fri, 29 May 2020 22:57:56 +0200
Subject: [PATCH] fix #256, set auto speed before applying the first layer one
 fix string type for tab.cpp

---
 src/libslic3r/GCode.cpp | 6 ++++--
 src/slic3r/GUI/Tab.cpp  | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 495c32bfd..842d49f24 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -3832,13 +3832,15 @@ std::string GCode::_before_extrude(const ExtrusionPath &path, const std::string
             throw std::invalid_argument("Invalid speed");
         }
     }
+    if (m_volumetric_speed != 0. && speed == 0)
+        speed = m_volumetric_speed / path.mm3_per_mm;
+    if (speed == 0) // this code shouldn't trigger as if it's 0, you have to get a m_volumetric_speed
+        speed = m_config.max_print_speed.value;
     if (this->on_first_layer())
         if (path.role() == erInternalInfill || path.role() == erSolidInfill)
             speed = std::min(m_config.get_abs_value("first_layer_infill_speed", speed), speed);
         else
             speed = std::min(m_config.get_abs_value("first_layer_speed", speed), speed);
-    if (m_volumetric_speed != 0. && speed == 0)
-        speed = m_volumetric_speed / path.mm3_per_mm;
     if (m_config.max_volumetric_speed.value > 0) {
         // cap speed with max_volumetric_speed anyway (even if user is not using autospeed)
         speed = std::min(
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 6e129c55c..7847128ab 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -1184,17 +1184,17 @@ bool Tab::create_pages(std::string setting_type_name, int idx_page)
             if (params.size() < 2) continue;
             if (params.size() == 2) params.push_back("wrench");
 
-            std::wstring label = _(L(params[params.size()-2]));
+            std::string label = L(params[params.size()-2]);
 
             for (int i = 1; i < params.size() - 1; i++) {
                 if (params[i] == "idx")
                 {
-                    label = label + _(L(" " + std::to_string(int(idx_page + 1))));
+                    label = label + " " + std::to_string(int(idx_page + 1));
                 }
             }
 
             if(logs) std::cout << "create page " << label.c_str() <<" : "<< params[params.size() - 1] << "\n";
-            current_page = add_options_page(label, params[params.size() - 1]);
+            current_page = add_options_page(_(label), params[params.size() - 1]);
         }
         else if (boost::starts_with(full_line, "end_page"))
         {