Fix "slowly to red" fading (aka same_fade) when we have a forced transition.

[ccbs] / bigscreen / rotatescreen.cpp

diff --git a/bigscreen/rotatescreen.cpp b/bigscreen/rotatescreen.cpp
index ef7fba079005daa5b4eed55c6b73eeccb1aaace9..a7d3a5c01b34a89b9f6aef7d615d5591526afeaa 100644 (file)
--- 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);