From a632a599d3388f5bc0c1a2680ee0d6d6d877aea9 Mon Sep 17 00:00:00 2001
From: Eugene Pankov <john.pankov@gmail.com>
Date: Tue, 13 Jul 2021 22:20:59 +0200
Subject: [PATCH] WSL: fixed multiple distro detection

---
 app/package.json                                    |  2 +-
 app/yarn.lock                                       | 10 +++++-----
 tabby-core/src/services/profiles.service.ts         |  1 -
 tabby-local/src/components/terminalTab.component.ts |  2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/package.json b/app/package.json
index b0bf48f5..14ea01fe 100644
--- a/app/package.json
+++ b/app/package.json
@@ -35,7 +35,7 @@
     "macos-native-processlist": "^2.0.0",
     "serialport": "^9.2.0",
     "windows-blurbehind": "^1.0.1",
-    "windows-native-registry": "^3.0.0",
+    "windows-native-registry": "^3.1.0",
     "windows-process-tree": "^0.3.0"
   },
   "devDependencies": {
diff --git a/app/yarn.lock b/app/yarn.lock
index 4b1bc612..2cdd5cb3 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -3586,12 +3586,12 @@ windows-blurbehind@^1.0.1:
   resolved "https://registry.yarnpkg.com/windows-blurbehind/-/windows-blurbehind-1.0.1.tgz#ff098713873304e38330b2c54cc41bb369b587b9"
   integrity sha512-1HzHfCiM1ayrbACJu5qE9zELV24uX/tINT6kxaZwLY3rtQAoeav6x9z7LFHWoLaGDN/sYbnK+9Vk0cz7fsk5HQ==
 
-windows-native-registry@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/windows-native-registry/-/windows-native-registry-3.0.0.tgz#82e715df7a59d5054c768547d81e0bfc81a59d2e"
-  integrity sha512-Mz/9a23UivwPc23DsTOL/ZCp/XXogT+6h/khk1psOfDDusXqpomBdxNdsBBE/BvIgOExjGom0XPOfEPiDnHy7A==
+windows-native-registry@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/windows-native-registry/-/windows-native-registry-3.1.0.tgz#909ef3254519fdec57d2f149ac59a2c9dc84419a"
+  integrity sha512-WrDysn2V7dH+EYE6cS2RF+7r2P+M0pOYWtU8iBrjV2HaGkCLlUdGUWzOdzT0JPdWwz0BkVu3IOae2xmBajQqBA==
   dependencies:
-    node-addon-api "^3.0.0"
+    node-addon-api "^3.1.0"
 
 windows-process-tree@^0.3.0:
   version "0.3.0"
diff --git a/tabby-core/src/services/profiles.service.ts b/tabby-core/src/services/profiles.service.ts
index d23b7fa8..8cfe2f43 100644
--- a/tabby-core/src/services/profiles.service.ts
+++ b/tabby-core/src/services/profiles.service.ts
@@ -33,7 +33,6 @@ export class ProfilesService {
     ) { }
 
     async openNewTabForProfile (profile: Profile): Promise<BaseTabComponent|null> {
-        profile = this.getConfigProxyForProfile(profile)
         const params = await this.newTabParametersForProfile(profile)
         if (params) {
             const tab = this.app.openNewTab(params)
diff --git a/tabby-local/src/components/terminalTab.component.ts b/tabby-local/src/components/terminalTab.component.ts
index 41b414d5..59175c65 100644
--- a/tabby-local/src/components/terminalTab.component.ts
+++ b/tabby-local/src/components/terminalTab.component.ts
@@ -75,7 +75,7 @@ export class TerminalTabComponent extends BaseTerminalTabComponent {
     async getRecoveryToken (): Promise<any> {
         const cwd = this.session ? await this.session.getWorkingDirectory() : null
         return {
-            type: 'app:terminal-tab',
+            type: 'app:local-tab',
             profile: {
                 ...this.profile,
                 options: {