From 2f1a754f709aa4a5ff051c2a785fb5ee7b765c18 Mon Sep 17 00:00:00 2001
From: remi durand <remi-j.durand@thalesgroup.com>
Date: Mon, 4 Jan 2021 16:29:03 +0100
Subject: [PATCH] some fix for coPercent cast &
 m_machine_limits_description_line null check

---
 src/libslic3r/PrintConfig.cpp | 9 ++-------
 src/slic3r/GUI/Tab.cpp        | 3 ++-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index f3d550fbf..adb1df6d2 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -5664,20 +5664,15 @@ std::string FullPrintConfig::validate()
         bool out_of_range = false;
         switch (opt->type()) {
         case coFloat:
+        case coPercent:
         {
             auto *fopt = static_cast<const ConfigOptionFloat*>(opt);
             out_of_range = fopt->value < optdef->min || fopt->value > optdef->max;
             break;
         }
-        case coPercent:
-        {
-            auto* fopt = static_cast<const ConfigOptionPercent*>(opt);
-            out_of_range = fopt->get_abs_value(100) < optdef->min || fopt->get_abs_value(100) > optdef->max;
-            break;
-        }
         case coFloatOrPercent:
         {
-            auto *fopt = static_cast<const ConfigOptionPercent*>(opt);
+            auto *fopt = static_cast<const ConfigOptionFloatOrPercent*>(opt);
             out_of_range = fopt->get_abs_value(1) < optdef->min || fopt->get_abs_value(1) > optdef->max;
             break;
         }
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 8dc7ef106..9dc815a7d 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -3794,7 +3794,8 @@ void TabPrinter::update_machine_limits_description(const MachineLimitsUsage usag
         break;
 	default: assert(false);
 	}
-    m_machine_limits_description_line->SetText(text);
+    if(m_machine_limits_description_line)
+        m_machine_limits_description_line->SetText(text);
 
     //update fields used
     //no need to worry for "silent" version, as it's only for marlin.