Merge branch 'master' into mypy_fixes

Contributes to CURA-5330
This commit is contained in:
Diego Prado Gesto 2018-06-08 15:29:22 +02:00
commit e5e96bc600
98 changed files with 19713 additions and 16495 deletions

View file

@ -254,8 +254,8 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
self._last_manager_create_time = time()
self._manager.authenticationRequired.connect(self._onAuthenticationRequired)
machine_manager = CuraApplication.getInstance().getMachineManager()
machine_manager.checkCorrectGroupName(self.getId(), self.name)
if self._properties.get(b"temporary", b"false") != b"true":
Application.getInstance().getMachineManager().checkCorrectGroupName(self.getId(), self.name)
def _registerOnFinishedCallback(self, reply: QNetworkReply, on_finished: Optional[Callable[[QNetworkReply], None]]) -> None:
if on_finished is not None: