From 866e63095238f3d8fc2d3ab991478476e2fdd3a6 Mon Sep 17 00:00:00 2001
From: Robin Jones <networkfusion@users.noreply.github.com>
Date: Thu, 7 Nov 2024 23:01:32 +0000
Subject: [PATCH] Improve RTC adjustment logic

Handle events where RTC is unavailable.
---
 src/menu/views/rtc.c | 63 ++++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/menu/views/rtc.c b/src/menu/views/rtc.c
index c93d7aa2..88196d00 100644
--- a/src/menu/views/rtc.c
+++ b/src/menu/views/rtc.c
@@ -119,7 +119,7 @@ static void process (menu_t *menu) {
         sound_play_effect(SFX_EXIT);
         menu->next_mode = MENU_MODE_BROWSER;
     }
-    else if (menu->actions.enter && !is_editing_mode) {
+    else if (menu->actions.enter && !is_editing_mode && menu->current_time >= 0) {
         rtc_tm = *gmtime(&menu->current_time);
         is_editing_mode = true;
     }
@@ -169,26 +169,49 @@ static void draw (menu_t *menu, surface_t *d) {
 
     component_layout_draw();
 
-    component_main_text_draw(
-        ALIGN_CENTER, VALIGN_TOP,
-        "ADJUST REAL TIME CLOCK\n"
-        "\n"
-        "\n"
-        "To set the RTC date and time, Press A.\n"
-        "You can also use the PC terminal application via USB,\n"
-        "or even an N64 game with RTC support.\n"
-        "\n"
-        "Current date & time: %s\n"
-        "\n",
-        menu->current_time >= 0 ? ctime(&menu->current_time) : "Unknown"
-    );
-
     if (!is_editing_mode) {
-        component_actions_bar_text_draw(
-            ALIGN_LEFT, VALIGN_TOP,
-            "A: Change\n"
-            "B: Back"
-        );
+         if( menu->current_time >= 0 ) {
+
+            component_main_text_draw(
+                ALIGN_CENTER, VALIGN_TOP,
+                "ADJUST REAL TIME CLOCK\n"
+                "\n"
+                "\n"
+                "To set the RTC date and time, Press A.\n"
+                "You can also use the PC terminal application via USB,\n"
+                "or even an N64 game with RTC support.\n"
+                "\n"
+                "Current date & time: %s\n"
+                "\n",
+                menu->current_time >= 0 ? ctime(&menu->current_time) : "Unknown"
+            );
+
+            component_actions_bar_text_draw(
+                ALIGN_LEFT, VALIGN_TOP,
+                "A: Change\n"
+                "B: Back"
+            );
+         }
+         else {
+
+            component_main_text_draw(
+                ALIGN_CENTER, VALIGN_TOP,
+                "ADJUST REAL TIME CLOCK\n"
+                "\n"
+                "\n"
+                "This cart does not support a real time clock."
+                "\n"
+                "Current date & time: %s\n"
+                "\n",
+                menu->current_time >= 0 ? ctime(&menu->current_time) : "Unknown"
+            );
+
+            component_actions_bar_text_draw(
+                ALIGN_LEFT, VALIGN_TOP,
+                "\n"
+                "B: Back"
+            );
+         }
     }
     else {
         component_actions_bar_text_draw(