From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
Date: Mon, 29 Jun 2015 21:14:45 +0000 (-0400)
Subject: Restore commit fda889d91263c6c381334e4f7a6d1bbb687a8e3f
X-Git-Tag: lulzbot-15.02.1-2.01~70
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=30109ec828bfdd80b2f2f529a1d52fff03501eff;p=cura.git

Restore commit fda889d91263c6c381334e4f7a6d1bbb687a8e3f
---

diff --git a/Cura/util/printerConnection/serialConnection.py b/Cura/util/printerConnection/serialConnection.py
index db447ce9..81f03bf4 100644
--- a/Cura/util/printerConnection/serialConnection.py
+++ b/Cura/util/printerConnection/serialConnection.py
@@ -116,7 +116,7 @@ class serialConnection(printerConnectionBase.printerConnectionBase):
 		self.disableSteppers()
 
 	def isPrinting(self):
-		return self._commState == machineCom.MachineCom.STATE_PRINTING or self.isPaused()
+		return self._commState == machineCom.MachineCom.STATE_PRINTING
 
 	#Returns true if we have the ability to pause the file printing.
 	def hasPause(self):
@@ -127,7 +127,7 @@ class serialConnection(printerConnectionBase.printerConnectionBase):
 
 	#Pause or unpause the printing depending on the value, if supported.
 	def pause(self, value):
-		if not self.isPrinting() or self._process is None:
+		if not (self.isPrinting() or self.isPaused()) or self._process is None:
 			return
 		self._process.stdin.write('PAUSE\n' if value else "RESUME\n")