kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 04:02:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1507 from shbatm/bug-fix

Browse Source 
Error handling for bad git data in updatenotification
This commit is contained in:
Michael Teeuw 2019-01-04 17:00:27 +01:00 committed by GitHub
commit ebc57fe494
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
- Fixed temperature displays in currentweather and weatherforecast modules [#1503](https://github.com/MichMich/MagicMirror/issues/1503). - Fixed temperature displays in currentweather and weatherforecast modules [#1503](https://github.com/MichMich/MagicMirror/issues/1503).
- Fixed unhandled error on bad git data in updatenotiifcation module [#1285](https://github.com/MichMich/MagicMirror/issues/1285).
- Weather forecast now works with openweathermap in new weather module. Daily data are displayed, see issue [#1504](https://github.com/MichMich/MagicMirror/issues/1504). - Weather forecast now works with openweathermap in new weather module. Daily data are displayed, see issue [#1504](https://github.com/MichMich/MagicMirror/issues/1504).
## [2.6.0] - 2019-01-01 ## [2.6.0] - 2019-01-01

6
modules/default/updatenotification/node_helper.js
View File

@ -65,8 +65,10 @@ module.exports = NodeHelper.create({
data.module = sg.module; data.module = sg.module;
if (!err) { if (!err) {
sg.git.log({"-1": null}, function(err, data2) { sg.git.log({"-1": null}, function(err, data2) {
data.hash = data2.latest.hash; if (!err) {
self.sendSocketNotification("STATUS", data); data.hash = data2.latest.hash;
self.sendSocketNotification("STATUS", data);
}
}); });
} }
}); });