Browse Source

handle null results from winreg (fixes #174)

Eugene Pankov 8 years ago
parent
commit
34ef809aee

+ 1 - 1
terminus-terminal/src/shells/cygwin32.ts

@@ -25,7 +25,7 @@ export class Cygwin32ShellProvider extends ShellProvider {
         let cygwinPath = await new Promise<string>(resolve => {
             let reg = new Registry({ hive: Registry.HKLM, key: '\\Software\\Cygwin\\setup', arch: 'x86' })
             reg.get('rootdir', (err, item) => {
-                if (err) {
+                if (err || !item) {
                     return resolve(null)
                 }
                 resolve(item.value)

+ 1 - 1
terminus-terminal/src/shells/cygwin64.ts

@@ -25,7 +25,7 @@ export class Cygwin64ShellProvider extends ShellProvider {
         let cygwinPath = await new Promise<string>(resolve => {
             let reg = new Registry({ hive: Registry.HKLM, key: '\\Software\\Cygwin\\setup', arch: 'x64' })
             reg.get('rootdir', (err, item) => {
-                if (err) {
+                if (err || !item) {
                     return resolve(null)
                 }
                 resolve(item.value)

+ 1 - 1
terminus-terminal/src/shells/gitBash.ts

@@ -25,7 +25,7 @@ export class GitBashShellProvider extends ShellProvider {
         let gitBashPath = await new Promise<string>(resolve => {
             let reg = new Registry({ hive: Registry.HKLM, key: '\\Software\\GitForWindows' })
             reg.get('InstallPath', (err, item) => {
-                if (err) {
+                if (err || !item) {
                     resolve(null)
                     return
                 }