fix tab icon loading

avocadianmage · Sep 8, 2018 · 5313185 · 5313185
1 parent ad10f7c
commit 5313185
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "boysen",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "A modern and lightweight PowerShell emulator",
     "main": "src/ts-build/main.js",
     "scripts": {
@@ -23,7 +23,7 @@
         "ajv": "^6.0.0",
         "dragula": "^3.7.2",
         "electron-tabs": "^0.9.4",
-        "file-icon-info": "^1.0.14",
+        "file-icon-info": "^1.0.15",
         "node-pty": "^0.7.6",
         "xterm": "^3.6.0"
     },

diff --git a/src/ts/TabManager.ts b/src/ts/TabManager.ts
@@ -157,14 +157,17 @@ export class TabManager {
     }
 
     private setTabIconFromShell(tab: TabGroup.Tab, exeName: string) {
-        const appDataPath = process.env.APPDATA;
-        const appName = path.basename(process.argv[1]);
-        const iconPath 
-            = `${appDataPath}/${appName}/Cache/shell-icons/${exeName}.ico`;
+        const iconPath = path.join(
+            process.env.APPDATA!, 
+            'boysen', 
+            'Cache', 
+            'shell-icons',
+            `${exeName}.ico`
+        );
 
         // If icon file is already cached, use it.
         if (fs.existsSync(iconPath)) tab.setIcon(iconPath);
-
+        
         // Find the full file path of the shell executable and extract its icon.
         else exec('where ' + exeName, (err, stdout, stderr) => {
             if (err) console.log(stderr);