Merge branch '3.0'

This commit is contained in:
Ghostkeeper 2017-10-10 14:36:38 +02:00
commit d962ffb8d8
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
6 changed files with 720 additions and 568 deletions

View file

@ -145,7 +145,6 @@ class NetworkPrinterOutputDevicePlugin(QObject, OutputDevicePlugin):
Logger.log("e", "Printer returned incorrect UTF-8.")
return
if address not in self._network_requests_buffer:
self._network_requests_buffer[address] = {}
self._network_requests_buffer[address]["system"] = system_info