mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-16 03:07:53 -06:00
Block sending several files now works even if there is a mismatching - CURA-4398
This commit is contained in:
parent
7d1722088b
commit
c9e8f7c743
1 changed files with 12 additions and 11 deletions
|
@ -753,17 +753,6 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
# Check if we're already writing
|
|
||||||
if not self._write_finished:
|
|
||||||
self._error_message = Message(
|
|
||||||
i18n_catalog.i18nc("@info:status",
|
|
||||||
"Sending new jobs (temporarily) blocked, still sending the previous print job."))
|
|
||||||
self._error_message.show()
|
|
||||||
return
|
|
||||||
|
|
||||||
# Indicate we're starting a new write action, is set back to True in the startPrint() method
|
|
||||||
self._write_finished = False
|
|
||||||
|
|
||||||
self.startPrint()
|
self.startPrint()
|
||||||
|
|
||||||
def _configurationMismatchMessageCallback(self, button):
|
def _configurationMismatchMessageCallback(self, button):
|
||||||
|
@ -854,6 +843,18 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
|
||||||
# This function can fail to actually start a print due to not being authenticated or another print already
|
# This function can fail to actually start a print due to not being authenticated or another print already
|
||||||
# being in progress.
|
# being in progress.
|
||||||
def startPrint(self):
|
def startPrint(self):
|
||||||
|
|
||||||
|
# Check if we're already writing
|
||||||
|
if not self._write_finished:
|
||||||
|
self._error_message = Message(
|
||||||
|
i18n_catalog.i18nc("@info:status",
|
||||||
|
"Sending new jobs (temporarily) blocked, still sending the previous print job."))
|
||||||
|
self._error_message.show()
|
||||||
|
return
|
||||||
|
|
||||||
|
# Indicate we're starting a new write action, is set back to True at the end of this method
|
||||||
|
self._write_finished = False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self._send_gcode_start = time()
|
self._send_gcode_start = time()
|
||||||
self._progress_message = Message(i18n_catalog.i18nc("@info:status", "Sending data to printer"), 0, False, -1, i18n_catalog.i18nc("@info:title", "Sending Data"))
|
self._progress_message = Message(i18n_catalog.i18nc("@info:status", "Sending data to printer"), 0, False, -1, i18n_catalog.i18nc("@info:title", "Sending Data"))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue