Merge branch 'master' into stable

fabianonline · Mar 24, 2016 · 036ddf5 · 036ddf5
2 parents 1e995db + 520af63
commit 036ddf5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/octoprint_telegram/__init__.py b/octoprint_telegram/__init__.py
@@ -383,8 +383,8 @@ def on_event(self, event, payload, *args, **kwargs):
 			self._logger.debug(str(status))
 			temps = self._printer.get_current_temperatures()
 			self._logger.debug(str(temps))
-			bed_temp = temps['bed']['actual']
-			bed_target = temps['bed']['target']
+			bed_temp = temps['bed']['actual'] if 'bed' in temps else 0.0
+			bed_target = temps['bed']['target'] if 'bed' in temps else 0.0 
 			e1_temp = temps['tool0']['actual']
 			e1_target = temps['tool0']['target']
 			e2_temp = e2_target = None

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 plugin_name = "OctoPrint-Telegram"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.1.1"
+plugin_version = "1.1.2"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module