From 6e73c31a680262945d7a1def8052821ed8fc9802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Fri, 22 Jul 2016 10:50:48 +0200
Subject: [PATCH] Report correct printer state even after disconnecting

Error string on close with error would get lost, that happens no longer
---
 src/octoprint/printer/standard.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/octoprint/printer/standard.py b/src/octoprint/printer/standard.py
index 8a446036..e7e1b650 100644
--- a/src/octoprint/printer/standard.py
+++ b/src/octoprint/printer/standard.py
@@ -588,9 +588,12 @@ class Printer(PrinterInterface, comm.MachineComPrintCallback):
 		self._currentZ = currentZ
 		self._stateMonitor.set_current_z(self._currentZ)
 
-	def _setState(self, state):
+	def _setState(self, state, state_string=None):
+		if state_string is None:
+			state_string = self.get_state_string()
+
 		self._state = state
-		self._stateMonitor.set_state({"text": self.get_state_string(), "flags": self._getStateFlags()})
+		self._stateMonitor.set_state({"text": state_string, "flags": self._getStateFlags()})
 
 	def _addLog(self, log):
 		self._log.append(log)
@@ -811,6 +814,9 @@ class Printer(PrinterInterface, comm.MachineComPrintCallback):
 		"""
 		oldState = self._state
 
+		if self._comm is not None:
+			state_string = self._comm.getStateString()
+
 		# forward relevant state changes to gcode manager
 		if oldState == comm.MachineCom.STATE_PRINTING:
 			with self._selectedFileLock:
@@ -829,7 +835,7 @@ class Printer(PrinterInterface, comm.MachineComPrintCallback):
 			self._setCurrentZ(None)
 			self._setJobData(None, None, None)
 
-		self._setState(state)
+		self._setState(state, state_string=state_string)
 
 	def on_comm_message(self, message):
 		"""