Merge branch 'master' of https://github.com/avmaisak/Gcode

avmaisak · Feb 13, 2020 · badd2a1 · badd2a1
2 parents 47bd81c + fe99b2c
commit badd2a1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Gcode.Utils/SlicerParser/PrusaSlicerParser.cs b/src/Gcode.Utils/SlicerParser/PrusaSlicerParser.cs
@@ -23,13 +23,13 @@ public override Slic3RInfo GetSlicerInfo(string[] fileContent)
 			var filamentUsed = fileContent.Where(x => x.StartsWith("; filament used [mm] = ")).ToArray();
 			if (filamentUsed.Length == 1 && filamentUsed[0] != null)
 			{
-				res.FilamentUsedExtruder1 = Convert.ToDecimal(filamentUsed[0].Split('=')[1].Split(',')[0].Trim().Replace(".",","));
+				res.FilamentUsedExtruder1 = Convert.ToDecimal(filamentUsed[0].Split(';')[1].Split('=')[1].Trim().Replace(".",","));
 			}
 
 			if (filamentUsed.Length == 2 && filamentUsed[1] != null)
 			{
 				// filament used
-				res.FilamentUsedExtruder2 = Convert.ToDecimal(filamentUsed[1].Split('=')[1]?.Split('=')[1].Split(','));
+				res.FilamentUsedExtruder2 = Convert.ToDecimal(filamentUsed[1].Split(';')[1].Split('=')[1].Trim().Replace(".",","));
 			}
 
 			var filamentDiameter = fileContent.FirstOrDefault(x => x.StartsWith("; filament_diameter"));