chiark
/
gitweb
/
~ianmdlvl
/
cura.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
30109ec
)
Allow canceling while paused
author
nickthetait
<tait@alephobjects.com>
Wed, 1 Jul 2015 17:16:38 +0000
(11:16 -0600)
committer
nickthetait
<tait@alephobjects.com>
Wed, 1 Jul 2015 17:16:38 +0000
(11:16 -0600)
Cura/util/printerConnection/serialConnection.py
patch
|
blob
|
history
diff --git
a/Cura/util/printerConnection/serialConnection.py
b/Cura/util/printerConnection/serialConnection.py
index 81f03bf4337b4934476d5ab7945e0f6be2d63405..4b1d6bb55516adef38d354cb0f636dc6c80d09f0 100644
(file)
--- a/
Cura/util/printerConnection/serialConnection.py
+++ b/
Cura/util/printerConnection/serialConnection.py
@@
-108,7
+108,8
@@
class serialConnection(printerConnectionBase.printerConnectionBase):
#Abort the previously loaded print file
def cancelPrint(self):
- if not self.isPrinting() or self._process is None:
+ if (not self.isPrinting() and not self.isPaused()) or \
+ self._process is None:
return
self._process.stdin.write('STOP\n')
self._printProgress = 0