# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1673274904 -3600
# Node ID ccf00788bccc0c68c4c74b0304b0d3980a0f9dc5
# Parent  d4cff87ea1568edcaa4099f7ec3696e54b113d6b
Backported mash calculation from EditProduct to EditRecipe.

diff -r d4cff87ea156 -r ccf00788bccc src/EditRecipeTab2.cpp
--- a/src/EditRecipeTab2.cpp	Mon Jan 09 15:03:55 2023 +0100
+++ b/src/EditRecipeTab2.cpp	Mon Jan 09 15:35:04 2023 +0100
@@ -171,9 +171,12 @@
 	for (i = 0; i < recipe->mashs.size(); i++) {
 	    if (recipe->mashs.at(i).step_type == 0)		// Infusion
 		mashinfuse += recipe->mashs.at(i).step_infuse_amount;
-	    if (recipe->mashs.at(i).step_temp < 75) {		// Ignore mashout
-		mashtime += recipe->mashs.at(i).step_time;
-		mashtemp += recipe->mashs.at(i).step_time * recipe->mashs.at(i).step_temp;
+	    if (recipe->mashs.at(i).step_temp <= 75 && recipe->mashs.at(i).step_temp >= 60) {	// Ignore mashout and low temperatures.
+		double timem = recipe->mashs.at(i).step_time;
+		if (i > 0)
+		    timem += recipe->mashs.at(i).ramp_time;
+		mashtime += timem;
+		mashtemp += timem * recipe->mashs.at(i).step_temp;
 	    }
 	}
 	mashtemp = mashtemp / mashtime;