gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into dbkr/electron_3

This commit is contained in:
David Baker 2016-11-03 14:58:12 +00:00
parent b3510d6973 4dab36d3b2
commit 6869c679ef
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/vector/index.js
View File

@ -179,13 +179,16 @@ function getConfig() {
if (err || response.status < 200 || response.status >= 300) { if (err || response.status < 200 || response.status >= 300) {
// Lack of a config isn't an error, we should // Lack of a config isn't an error, we should
// just use the defaults. // just use the defaults.
// Also treat a blank config as no config because // Also treat a blank config as no config, assuming
// we don't get 404s from file: URIs so this is the // the status code is 0, because we don't get 404s
// only way we can not fail if the file doesn't exist // from file: URIs so this is the only way we can
// when loading from a file:// URI. // not fail if the file doesn't exist when loading
if (( err && err.response.status == 404) || body == '') { // from a file:// URI.
if (response) {
if (response.status == 404 || (response.status == 0 && body == '')) {
deferred.resolve({}); deferred.resolve({});
} }
}
deferred.reject({err: err, response: response}); deferred.reject({err: err, response: response});
return; return;
} }