Fix for broken MBL

LCD call was waiting forever, causing the system to hang.
nicedevil007 · Feb 15, 2017 · c40fe21 · c40fe21
1 parent 4d4745c
commit c40fe21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
@@ -441,12 +441,6 @@ uint16_t max_display_update_time = 0;
     lcd_goto_screen(old_screen);
   }
 
-  inline void lcd_wait_for_homing() {
-    no_reentrance = true;
-    while (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS] || !axis_homed[Z_AXIS]) idle();
-    no_reentrance = false;
-  }
-
   void lcd_return_to_status() { lcd_goto_screen(lcd_status_screen); }
 
   void lcd_save_previous_screen() {
@@ -1297,9 +1291,8 @@ void kill_screen(const char* lcd_msg) {
           LCDVIEW_CALL_NO_REDRAW
         #endif
       ;
-      if (no_reentrance) return;
-      lcd_wait_for_homing();
-      lcd_goto_screen(_lcd_level_bed_homing_done);
+      if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
+        lcd_goto_screen(_lcd_level_bed_homing_done);
     }
 
     /**

diff --git 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
+  - Fixed broken MBL
 
 - RC8 - 06 Dec 2016
   - Major performance improvement for Graphical LCDs