Fix mode change reboot message not displayed in 4 & 8bpp modes

IanSB · Dec 30, 2024 · f1169c1 · f1169c1
1 parent 1197d36
commit f1169c1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/src/osd.c b/src/osd.c
@@ -4412,6 +4412,25 @@ int max_palette_count;
                             0xd7ffce,
                             0x9d9aff,
                             0xffffc9
+
+                            //possible alt - not in c64 order and rgb reversed
+                            0x00000000,
+                            0x258B3442,
+                            0x2D262D77,
+                            0x488B3442,
+                            0x9F87B2C9,
+                            0xCBFFFFC5,
+                            0x9FF59DE9,
+                            0xA8DCD485,
+                            0x564A73A8,
+                            0x7DCA707E,
+                            0xDEB0FFFF,
+                            0xBA71CCBD,
+                            0x864A9E55,
+                            0x8E6268B6,
+                            0xC387DF92,
+                            0xFFFFFFFF,
+
 */
 
 
@@ -6094,6 +6113,11 @@ int osd_active() {
    return active;
 }
 
+void set_osd_active() {
+   active = 1;
+   osd_update_palette(1);
+}
+
 int menu_active() {
    return ! (osd_state == IDLE || osd_state == DURATION || osd_state == A1_CAPTURE || osd_state == A1_CAPTURE_SUB);
 }

diff --git a/src/osd.h b/src/osd.h
@@ -361,6 +361,7 @@ void osd_update_fast(uint32_t *osd_base, int bytes_per_line);
 void osd_display_interface(int line);
 int lumacode_multiplier();
 int  osd_active();
+void set_osd_active();
 int menu_active();
 int  osd_key(int key);
 int get_border_colour();

diff --git a/src/rgb_to_hdmi.c b/src/rgb_to_hdmi.c
@@ -3591,6 +3591,8 @@ void rgb_to_hdmi_main() {
 #endif
 
          if (!osd_active() && reboot_required) {
+             set_osd_active(); //turn OSD back on
+             swapBuffer(get_current_display_buffer());  //make sure right buffer displayed
              if (resolution_warning != 0) {
                  osd_set_noupdate(0, 0, "If there is no display with new setting:");
                  osd_set_noupdate(1, 0, "Hold menu button during reset until you");