From 2ea14e2da7dd44d1482bb00bb7590db4e92fd724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Tue, 31 Jan 2017 21:58:46 -0300 Subject: [PATCH] hotfix PL #673 --- js/app.js | 5 +++++ js/defaults.js | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/js/app.js b/js/app.js index 6466fe3f26..58a3b1827d 100644 --- a/js/app.js +++ b/js/app.js @@ -21,6 +21,11 @@ if (process.env.MM_CONFIG_FILE) { global.configuration_file = process.env.MM_CONFIG_FILE; } +//Hotfix PullRequest #673 +if (process.env.MM_PORT) { + global.mm_port = process.env.MM_PORT; +} + // The next part is here to prevent a major exception when there // is no internet connection. This could probable be solved better. process.on("uncaughtException", function (err) { diff --git a/js/defaults.js b/js/defaults.js index e7e960363b..7f40d84893 100644 --- a/js/defaults.js +++ b/js/defaults.js @@ -7,8 +7,12 @@ * MIT Licensed. */ +var port = 8080; +if (typeof(mm_port) !== "undefined") { + port = mm_port; +} var defaults = { - port: process.env.MM_PORT || 8080, + port: port, kioskmode: false, electronOptions: {}, ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],