From 20ca50f0b5bcde986107afa7631ea16e5a7edaed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 4 Jul 2016 11:08:53 +0200 Subject: [PATCH] Only fetch showFahrenheit flag from settings if they are available --- src/octoprint/static/js/app/viewmodels/temperature.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/octoprint/static/js/app/viewmodels/temperature.js b/src/octoprint/static/js/app/viewmodels/temperature.js index 08735704..089cbfc6 100644 --- a/src/octoprint/static/js/app/viewmodels/temperature.js +++ b/src/octoprint/static/js/app/viewmodels/temperature.js @@ -251,7 +251,9 @@ $(function() { targets = self.temperatures[type].target; } - var showFahrenheit = self.settingsViewModel.settings.appearance.showFahrenheitAlso(); + var showFahrenheit = (self.settingsViewModel.settings !== undefined ) + ? self.settingsViewModel.settings.appearance.showFahrenheitAlso() + : false; var actualTemp = actuals && actuals.length ? formatTemperature(actuals[actuals.length - 1][1], showFahrenheit) : "-"; var targetTemp = targets && targets.length ? formatTemperature(targets[targets.length - 1][1], showFahrenheit) : "-"; @@ -288,7 +290,7 @@ $(function() { } }); return maxTemp; - } + }; self.setTarget = function(item) { var value = item.newTarget();