From f292a6ca7ab532ae0f48f042a3ff26d31c301dd4 Mon Sep 17 00:00:00 2001
From: Marek Bel <marek.bel@posta.cz>
Date: Mon, 21 Jan 2019 21:39:38 +0100
Subject: [PATCH] Refactor filament sensor selftest call.

---
 Firmware/ultralcd.cpp | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 937ccd5a1..b96050649 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6418,21 +6418,25 @@ bool lcd_selftest()
 	if (_result)
 	{
 		_progress = lcd_selftest_screen(8, _progress, 3, true, 2000); //bed ok
-#ifdef FILAMENT_SENSOR
-		if (mmu_enabled == false) {
-			_progress = lcd_selftest_screen(9, _progress, 3, true, 2000); //check filaments sensor
-			_result = lcd_selftest_fsensor();
-		}
-#endif // FILAMENT_SENSOR
 	}
+
+#ifdef FILAMENT_SENSOR
+    if (mmu_enabled == false)
+    {
+        if (_result)
+        {
+            _progress = lcd_selftest_screen(9, _progress, 3, true, 2000); //check filaments sensor
+            _result = lcd_selftest_fsensor();
+        }
+        if (_result)
+        {
+            _progress = lcd_selftest_screen(10, _progress, 3, true, 2000); //fil sensor OK
+        }
+    }
+#endif // FILAMENT_SENSOR
+
 	if (_result)
 	{
-#ifdef FILAMENT_SENSOR
-		if (mmu_enabled == false)
-		{
-			_progress = lcd_selftest_screen(10, _progress, 3, true, 2000); //fil sensor OK
-		}
-#endif // FILAMENT_SENSOR
 		_progress = lcd_selftest_screen(11, _progress, 3, true, 5000); //all correct
 	}
 	else