fix: restore screen state on setup failure

Author: luccahuguet

src/screen_runner.rs

@@ -35,7 +35,6 @@ pub const SCREEN_RANDOM_STYLES: &[&str] = &[
     "game_of_life_bloom",
 ];
 
-#[derive(Clone, Copy)]
 enum ScreenStyle {
     Static,
     Logo,
@@ -50,7 +49,6 @@ enum AnimationStyle {
     Mandelbrot,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
 struct ScreenArgs {
     style: String,
     cell_style: GameOfLifeCellStyle,
@@ -649,12 +647,6 @@ mod tests {
         assert!(!frame.contains("just"));
     }
 
-    // Regression: the deleted image-backed magician style must not return through random selection.
-    #[test]
-    fn random_style_skips_magician() {
-        assert!(!SCREEN_RANDOM_STYLES.contains(&"magician"));
-    }
-
     // Defends: Game of Life keeps the same minimum-width sizing contract as the integrated screen renderer.
     #[test]
     fn game_of_life_context_preserves_inner_width_floor() {

src/terminal_control.rs

@@ -7,7 +7,7 @@ use crossterm::{
         LeaveAlternateScreen,
     },
 };
-use std::io::{self, Write};
+use std::io;
 
 fn command_string(write_commands: impl FnOnce(&mut Vec<u8>) -> io::Result<()>) -> String {
     crossterm::style::force_color_output(true);
@@ -78,13 +78,14 @@ pub(crate) fn enter_screen_mode() -> io::Result<()> {
         DisableLineWrap,
         Clear(ClearType::All),
         MoveTo(0, 0)
-    )?;
-    stdout.flush()
+    )
+    .inspect_err(|_| {
+        let _ = leave_screen_mode();
+    })
 }
 
 pub(crate) fn leave_screen_mode() -> io::Result<()> {
     crossterm::style::force_color_output(true);
     let mut stdout = io::stdout();
-    execute!(stdout, EnableLineWrap, Show, LeaveAlternateScreen)?;
-    stdout.flush()
+    execute!(stdout, EnableLineWrap, Show, LeaveAlternateScreen)
 }