From 932be53bb3968598d69f237c75008ff1708b719a Mon Sep 17 00:00:00 2001
From: Jack <bartnikjack@gmail.com>
Date: Fri, 2 Apr 2021 23:57:30 +0100
Subject: [PATCH] more bug fixes from the merge

---
 src/js/test/test-logic.js | 6 +++++-
 src/js/tribe.js           | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/js/test/test-logic.js b/src/js/test/test-logic.js
index cc9e69f4c..03df9b9c9 100644
--- a/src/js/test/test-logic.js
+++ b/src/js/test/test-logic.js
@@ -114,7 +114,11 @@ class Input {
   }
 
   getHistory(i) {
-    return this.history[i];
+    if (i === undefined) {
+      return this.history;
+    } else {
+      return this.history[i];
+    }
   }
 }
 
diff --git a/src/js/tribe.js b/src/js/tribe.js
index 667ddbead..46c668ef1 100644
--- a/src/js/tribe.js
+++ b/src/js/tribe.js
@@ -1386,7 +1386,7 @@ socket.on("mp_room_test_start", (data) => {
   // startTest();
   setTimeout(() => {
     if (!TestLogic.active) {
-      startTest();
+      TestLogic.startTest();
     }
   }, 500);
   // Notifications.add("test starting",0);