From 2d07d40c92a97c1cd2a05c01d38cf7dfeb321820 Mon Sep 17 00:00:00 2001
From: Akash Nimare <akashnimare@users.noreply.github.com>
Date: Sun, 18 Feb 2018 17:52:26 +0530
Subject: [PATCH] activetab: Fix broken last active tab. (#420)

This fixes an issue where the server tabs were not loading
according to the last active tab. This used to load last server
no matter what the last used server is.

Fixes - #416.
---
 app/main/index.js                        | 5 -----
 app/renderer/js/components/server-tab.js | 3 ++-
 app/renderer/js/main.js                  | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/main/index.js b/app/main/index.js
index f582c5d7..d394e187 100644
--- a/app/main/index.js
+++ b/app/main/index.js
@@ -221,11 +221,6 @@ app.on('ready', () => {
 		appMenu.setMenu(props);
 	});
 
-	ipcMain.on('register-server-tab-shortcut', (event, index) => {
-		// Array index == Shown index - 1
-		page.send('switch-server-tab', index - 1);
-	});
-
 	ipcMain.on('toggleAutoLauncher', (event, AutoLaunchValue) => {
 		setAutoLaunch(AutoLaunchValue);
 	});
diff --git a/app/renderer/js/components/server-tab.js b/app/renderer/js/components/server-tab.js
index ad626aed..0a11aa1d 100644
--- a/app/renderer/js/components/server-tab.js
+++ b/app/renderer/js/components/server-tab.js
@@ -50,7 +50,8 @@ class ServerTab extends Tab {
 			shortcutText = `Ctrl+${shownIndex}`;
 		}
 
-		ipcRenderer.send('register-server-tab-shortcut', shownIndex);
+		// Array index == Shown index - 1
+		ipcRenderer.send('switch-server-tab', shownIndex - 1);
 
 		return shortcutText;
 	}
diff --git a/app/renderer/js/main.js b/app/renderer/js/main.js
index 0aab4258..7529737c 100644
--- a/app/renderer/js/main.js
+++ b/app/renderer/js/main.js
@@ -419,7 +419,7 @@ class ServerManagerView {
 		});
 
 		ipcRenderer.on('switch-server-tab', (event, index) => {
-			this.activateTab(index);
+			this.activateLastTab(index);
 		});
 
 		ipcRenderer.on('reload-proxy', (event, showAlert) => {