Skip to content

Commit

Permalink
Merge pull request #1390 from ccrlawrence/patch-1
Browse files Browse the repository at this point in the history
ClientOnly: Global variable name used in callback function
  • Loading branch information
MichMich authored Aug 28, 2018
2 parents c4e8cc1 + f02c1e4 commit 116588c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Fix for weatherforecast rainfall rounding [#1374](https://github.com/MichMich/MagicMirror/issues/1374)
- Fix calendar parsing issue for Midori on RasperryPi Zero w, related to issue #694.
- Fix weather city ID link in sample config
- Fixed issue with clientonly not updating with IP address and port provided on command line.

### Updated

Expand Down
8 changes: 4 additions & 4 deletions clientonly/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@
// Only start the client if a non-local server was provided
if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].indexOf(config.address) === -1) {
getServerConfig(`http://${config.address}:${config.port}/config/`)
.then(function (config) {
.then(function (configReturn) {
// Pass along the server config via an environment variable
var env = Object.create(process.env);
var options = { env: env };
config.address = config.address;
config.port = config.port;
env.config = JSON.stringify(config);
configReturn.address = config.address;
configReturn.port = config.port;
env.config = JSON.stringify(configReturn);

// Spawn electron application
const electron = require("electron");
Expand Down

0 comments on commit 116588c

Please sign in to comment.