Make getValue return an int if it's an integer number

This is a more generic solution to what's done in 7058ddbb66084bee9cd507ed69f031ec1262163e.

Contributes to issue CURA-5491.

2 files changed, 9 insertions, 6 deletions

diff --git a/plugins/PostProcessingPlugin/Script.py b/plugins/PostProcessingPlugin/Script.py
index d844705f1c..cc839ca485 100644
--- a/plugins/PostProcessingPlugin/Script.py
+++ b/plugins/PostProcessingPlugin/Script.py
@@ -105,9 +105,12 @@ class Script:
         if m is None:
             return default
         try:
-            return float(m.group(0))
-        except:
-            return default
+            return int(m.group(0))
+        except ValueError: #Not an integer.
+            try:
+                return float(m.group(0))
+            except ValueError: #Not a number at all.
+                return default
 
     ##  Convenience function to produce a line of g-code.
     #
diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
index c78351909d..a70a54559c 100644
--- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
+++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
@@ -162,12 +162,12 @@ class PauseAtHeight(Script):
 
                 #Track the latest printing temperature in order to resume at the correct temperature.
                 if line.startswith("T"):
-                    current_t = int(self.getValue(line, "T"))
+                    current_t = self.getValue(line, "T")
                 m = self.getValue(line, "M")
-                if m is not None and (int(m) == 104 or int(m) == 109) and self.getValue(line, "S") is not None:
+                if m is not None and (m == 104 or m == 109) and self.getValue(line, "S") is not None:
                     extruder = current_t
                     if self.getValue(line, "T") is not None:
-                        extruder = int(self.getValue(line, "T"))
+                        extruder = self.getValue(line, "T")
                     target_temperature[extruder] = self.getValue(line, "S")
 
                 if not layers_started: