From 97f86af6b927747012deb1e585964dcdc555293c Mon Sep 17 00:00:00 2001
From: j433866 <j433866@gmail.com>
Date: Thu, 6 Jun 2019 16:53:58 +0100
Subject: [PATCH] Improve speed of changing input tabs. Handle not finding an
 active tab

---
 src/web/waiters/InputWaiter.mjs | 5 ++++-
 src/web/waiters/TabWaiter.mjs   | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/web/waiters/InputWaiter.mjs b/src/web/waiters/InputWaiter.mjs
index d6cb6636..8e26d7f9 100644
--- a/src/web/waiters/InputWaiter.mjs
+++ b/src/web/waiters/InputWaiter.mjs
@@ -947,7 +947,8 @@ class InputWaiter {
      * @param {boolean} [changeOutput=false] - If true, also changes the output
      */
     changeTab(inputNum, changeOutput) {
-        if (this.manager.tabs.changeInputTab(inputNum)) {
+        if (this.manager.tabs.getInputTabItem(inputNum) !== null) {
+            this.manager.tabs.changeInputTab(inputNum);
             this.inputWorker.postMessage({
                 action: "setInput",
                 data: {
@@ -1245,6 +1246,7 @@ class InputWaiter {
      */
     changeTabRight() {
         const activeTab = this.manager.tabs.getActiveInputTab();
+        if (activeTab === -1) return;
         this.inputWorker.postMessage({
             action: "changeTabRight",
             data: {
@@ -1258,6 +1260,7 @@ class InputWaiter {
      */
     changeTabLeft() {
         const activeTab = this.manager.tabs.getActiveInputTab();
+        if (activeTab === -1) return;
         this.inputWorker.postMessage({
             action: "changeTabLeft",
             data: {
diff --git a/src/web/waiters/TabWaiter.mjs b/src/web/waiters/TabWaiter.mjs
index ad158c74..3e54c814 100644
--- a/src/web/waiters/TabWaiter.mjs
+++ b/src/web/waiters/TabWaiter.mjs
@@ -288,8 +288,6 @@ class TabWaiter {
         } else {
             this.hideTabBar();
         }
-
-        this.changeTab(activeTab, io);
     }
 
     /**