Merge pull request thelounge#461 from thelounge/xpaw/check-config

Only load config if it exists
matburnham · Jul 4, 2016 · fcb5f2a · fcb5f2a
2 parents 0bf97e5 + 5cc928d
commit fcb5f2a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/helper.js b/src/helper.js
@@ -1,6 +1,7 @@
 var _ = require("lodash");
 var path = require("path");
 var os = require("os");
+var fs = require("fs");
 
 var Helper = {
 	config: null,
@@ -25,8 +26,10 @@ function setHome(homePath) {
 	this.USERS_PATH = path.join(this.HOME, "users");
 
 	// Reload config from new home location
-	var userConfig = require(this.CONFIG_PATH);
-	this.config = _.extend(this.config, userConfig);
+	if (fs.existsSync(this.CONFIG_PATH)) {
+		var userConfig = require(this.CONFIG_PATH);
+		this.config = _.extend(this.config, userConfig);
+	}
 }
 
 function getUserConfigPath(name) {