From 4bde66526670005abf648edf4480933ce9c6caa0 Mon Sep 17 00:00:00 2001
From: Tannoo <tannoo@msn.com>
Date: Fri, 30 Dec 2016 10:28:13 -0700
Subject: [PATCH] Prepare Menu fix

---
 Marlin/ultralcd.cpp | 17 ++++++++++++-----
 README.md           |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index ce42b1e540de..5a6ec16a5547 100755
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -1403,11 +1403,18 @@ void kill_screen(const char* lcd_msg) {
     // Cooldown
     //
     bool has_heat = false;
-    HOTEND_LOOP() if (thermalManager.target_temperature[e]) { has_heat = true; break; }
-    #if HAS_TEMP_BED
-      if (thermalManager.target_temperature_bed) has_heat = true;
-    #endif
-    if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
+    HOTEND_LOOP() if (thermalManager.target_temperature[e])
+      {
+        has_heat = true;
+        MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
+      }
+      else
+      {
+        #if HAS_TEMP_BED
+        if (thermalManager.target_temperature_bed) has_heat = true;
+        #endif
+        if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
+      }
 
     //
     // BLTouch Self-Test and Reset
diff --git a/README.md b/README.md
index 0df4f6ed755b..7e8536b2c8fa 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ The latest Release Candidate lives in the ["RC" branch](https://github.com/Marli
 
 ## Recent Changes
 - RCBugFix
+  - Prepare menu fix
 
 - RC8 - 06 Dec 2016
   - Major performance improvement for Graphical LCDs