Fixes a race condition causing stalls when pausing/cancelling

Closes #2581 & closes #2587
OctoPrint · Apr 18, 2018 · bf3da2a · bf3da2a
1 parent 472ab36
commit bf3da2a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py
@@ -1140,6 +1140,7 @@ def _on_M400_sent():
 
 			if self._log_position_on_cancel and not disable_log_position:
 				self.sendCommand("M400", on_sent=_on_M400_sent, tags=tags | {"trigger:comm.cancel", "trigger:record_position"})
+				self._continue_sending()
 			else:
 				self._cancel_preparation_done()
 
@@ -1205,6 +1206,7 @@ def _on_M400_sent():
 
 				if self._log_position_on_pause:
 					self.sendCommand("M400", on_sent=_on_M400_sent, tags=tags | {"trigger:comm.set_pause", "trigger:pause", "trigger:record_position"})
+					self._continue_sending()
 				else:
 					self._pause_preparation_done()