fix merge conflicts

plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py

@@ -23,16 +23,14 @@ from PyQt5.QtWidgets import QMessageBox
 import json
 import os
 import gzip
-import zlib
 
 from time import time
-from time import sleep
+
 from time import gmtime
+from enum import IntEnum
 
 i18n_catalog = i18nCatalog("cura")
 
-from enum import IntEnum
-
 class AuthState(IntEnum):
     NotAuthenticated = 1
     AuthenticationRequested = 2
@@ -335,13 +333,17 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
             self._camera_timer.stop()
 
         if self._image_reply:
+            skip_abort = False
             try:
                 try:
                     self._image_reply.downloadProgress.disconnect(self._onStreamDownloadProgress)
-                except TypeError:
-                    pass #The signal was never connected.
-                self._image_reply.abort()
-            except RuntimeError:
+                except Exception as e:
+                    if type(e) != RuntimeError: # can happen the RuntimeError occurs before calling abort (=see below), then then the application will crash
+                        skip_abort = True
+                        pass #The signal was never connected.
+                if not skip_abort:
+                    self._image_reply.abort()
+            except Exception as e: #RuntimeError
                 pass  # It can happen that the wrapped c++ object is already deleted.
             self._image_reply = None
             self._image_request = None
@@ -528,6 +530,9 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
         self._last_request_time = time()
 
     def _finalizePostReply(self):
+        # Indicate uploading was finished (so another file can be send)
+        self._write_finished = True
+
         if self._post_reply is None:
             return
 
@@ -836,6 +841,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
             Logger.log("d", "User aborted sending print to remote.")
             self._progress_message.hide()
             self._compressing_print = False
+            self._write_finished = True  # post_reply does not always exist, so make sure we unblock writing
             if self._post_reply:
                 self._finalizePostReply()
             Application.getInstance().showPrintMonitor.emit(False)
@@ -1203,6 +1209,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
                 # Remove cached post request items.
                 del self._material_post_objects[id(reply)]
             elif "print_job" in reply_url:
+                self._onUploadFinished()  # Make sure the upload flag is reset as reply.finished is not always triggered
                 try:
                     reply.uploadProgress.disconnect(self._onUploadProgress)
                 except: