Merge branch 'dev' into show-custom-error-messages

microsoftly · Jan 19, 2018 · b0e06c6 · b0e06c6
2 parents 932bdad + f34cfd5
commit b0e06c6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -69,6 +69,7 @@ export function getConfig(): IConfig {
 
     if (configFileExists) {
         configInternal = JSON.parse(fs.readFileSync(configFilePath, { encoding: 'utf8' }));
+        configInternal.timeout = configInternal.timeout || NO_TIMEOUT;
     }
 
     configInternal.messageFilters = [];