Add skip for rgb matrix exception handling

2 files changed, 6 insertions, 2 deletions

diff --git a/main.c b/main.c
index 8c5c9ac37..7c69cde08 100755
--- a/main.c
+++ b/main.c
@@ -276,7 +276,7 @@ bool run_code_py(safe_mode_t safe_mode) {
         }
     }
 
-    // Wait for connection or character.
+    // Display a different completion message if the user has no USB attached (cannot save files)
     if (!serial_connected_at_start) {
         serial_write_compressed(translate("\nCode done running. Waiting for reload.\n"));
     }
diff --git a/supervisor/shared/rgb_led_status.c b/supervisor/shared/rgb_led_status.c
index fe99129f8..2f23e3125 100644
--- a/supervisor/shared/rgb_led_status.c
+++ b/supervisor/shared/rgb_led_status.c
@@ -366,6 +366,11 @@ void prep_rgb_status_animation(const pyexec_result_t* result,
     status->safe_mode = safe_mode;
     status->found_main = found_main;
     status->total_exception_cycle = 0;
+    status->ok = result->return_code != PYEXEC_EXCEPTION;
+    if (status->ok) {
+        // If this isn't an exception, skip exception sorting and handling
+        return;
+    }
     status->ones = result->exception_line % 10;
     status->ones += status->ones > 0 ? 1 : 0;
     status->tens = (result->exception_line / 10) % 10;
@@ -383,7 +388,6 @@ void prep_rgb_status_animation(const pyexec_result_t* result,
         }
         line /= 10;
     }
-    status->ok = result->return_code != PYEXEC_EXCEPTION;
     if (!status->ok) {
         status->total_exception_cycle = EXCEPTION_TYPE_LENGTH_MS * 3 + LINE_NUMBER_TOGGLE_LENGTH * status->digit_sum + LINE_NUMBER_TOGGLE_LENGTH * num_places;
     }