From 3e10f2cb8c5daedea8225008161e957e99d2fbb1 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sat, 17 Jun 2023 18:56:08 -0700
Subject: [PATCH] Reset layout when aborting HW diagnostics

---
 scripts/wk/hw/diags.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/wk/hw/diags.py b/scripts/wk/hw/diags.py
index e4055073..ff701813 100644
--- a/scripts/wk/hw/diags.py
+++ b/scripts/wk/hw/diags.py
@@ -100,8 +100,7 @@ class State():
           test.set_status('Aborted')
 
     # Cleanup panes
-    self.ui.remove_all_info_panes()
-    self.ui.remove_all_worker_panes()
+    self.reset_layout()
 
   def disk_safety_checks(self) -> None:
     """Check for mid-run SMART failures and failed test(s)."""
@@ -185,6 +184,12 @@ class State():
           test_group.test_objects.append(test_obj)
         self.test_groups.append(test_group)
 
+  def reset_layout(self) -> None:
+    """Reset layout to avoid flickering."""
+    self.ui.clear_current_pane_height()
+    self.ui.remove_all_info_panes()
+    self.ui.remove_all_worker_panes()
+
   def save_debug_reports(self) -> None:
     """Save debug reports to disk."""
     LOG.info('Saving debug reports')
@@ -788,6 +793,7 @@ def run_diags(state, menu, quick_mode=False, test_mode=False) -> None:
       aborted = True
       state.abort_testing()
       state.update_progress_file()
+      state.reset_layout()
       break
     else:
       # Run safety checks after disk tests