From: Steinar H. Gunderson Date: Tue, 1 Mar 2005 00:55:12 +0000 (+0000) Subject: Fix "slowly to red" fading (aka same_fade) when we have a forced transition. X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=d994a4d55c8390dc892490345160cb79ff91caeb Fix "slowly to red" fading (aka same_fade) when we have a forced transition. --- diff --git a/bigscreen/rotatescreen.cpp b/bigscreen/rotatescreen.cpp index ef7fba0..a7d3a5c 100644 --- a/bigscreen/rotatescreen.cpp +++ b/bigscreen/rotatescreen.cpp @@ -120,7 +120,7 @@ void RotateScreen::draw(unsigned char *buf) // initialize a fade in_fade = true; fade_found_start_time = false; - same_fade = (current_screen == old_current_screen); + same_fade = (current_screen == old_current_screen) || force; memcpy(fadefrom_buf, subscreens[old_current_screen].buf, 800 * 600 * 4);