From fdf6aa3b0b688b47711639fa6256daff6b6cb8dc Mon Sep 17 00:00:00 2001
From: Estebene <glueh18@gmail.com>
Date: Sun, 16 May 2021 11:26:00 +1200
Subject: [PATCH] Changed activation logic

---
 src/js/test/pace-caret.js | 9 ++++-----
 src/js/test/test-ui.js    | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/js/test/pace-caret.js b/src/js/test/pace-caret.js
index 156a840a8..0d1f99393 100644
--- a/src/js/test/pace-caret.js
+++ b/src/js/test/pace-caret.js
@@ -6,7 +6,7 @@ import * as DB from "./db";
 export let settings = null;
 
 function resetCaretPosition() {
-  if (Config.paceCaret === "off") return;
+  if (Config.paceCaret === "off" && !TestLogic.isPaceRepeat) return;
   if (!$("#paceCaret").hasClass("hidden")) {
     $("#paceCaret").addClass("hidden");
   }
@@ -40,9 +40,7 @@ export async function init() {
     mode2 = TestLogic.randomQuote.id;
   }
   let wpm;
-  if (TestLogic.isPaceRepeat == true) {
-    wpm = TestLogic.lastTestWpm;
-  } else if (Config.paceCaret === "pb") {
+  if (Config.paceCaret === "pb") {
     wpm = await DB.getLocalPB(
       Config.mode,
       mode2,
@@ -71,8 +69,9 @@ export async function init() {
     console.log("avg pace " + wpm);
   } else if (Config.paceCaret === "custom") {
     wpm = Config.paceCaretCustomSpeed;
+  } else if (TestLogic.isPaceRepeat == true) {
+    wpm = TestLogic.lastTestWpm;
   }
-
   if (wpm < 1 || wpm == false || wpm == undefined || Number.isNaN(wpm)) {
     settings = null;
     return;
diff --git a/src/js/test/test-ui.js b/src/js/test/test-ui.js
index bb0619808..0f0a80bb2 100644
--- a/src/js/test/test-ui.js
+++ b/src/js/test/test-ui.js
@@ -490,19 +490,19 @@ export function updateModesNotice() {
     );
   }
 
-  if (Config.paceCaret !== "off") {
+  if (Config.paceCaret !== "off" || TestLogic.isPaceRepeat) {
     let speed = "";
     try {
       speed = ` (${Math.round(PaceCaret.settings.wpm)} wpm)`;
     } catch {}
     $(".pageTest #testModesNotice").append(
       `<div class="text-button" commands="commandsPaceCaret"><i class="fas fa-tachometer-alt"></i>${
-        TestLogic.isPaceRepeat
-          ? "repeated"
-          : Config.paceCaret === "average"
+        Config.paceCaret === "average"
           ? "average"
           : Config.paceCaret === "pb"
           ? "pb"
+          : Config.paceCaret == "off"
+          ? "repeated"
           : "custom"
       } pace${speed}</div>`
     );