Merge branch 'master' into 94-windows

psolyca · Nov 8, 2020 · 7eae4d7 · 7eae4d7
2 parents 7bc8c1d + ee3c067
commit 7eae4d7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scripts/totalopenstation-gui.py b/scripts/totalopenstation-gui.py
@@ -742,14 +742,14 @@ def connect(self):
                             sleep(sleeptime)
                         n = mc.inWaiting()
                         result = mc.read(n)
-                        self.replace_text(result.encode())
+                        self.replace_text(result.decode())
                         sleep(sleeptime)
 
                         while mc.inWaiting() > 0:
                             newdata = mc.read(mc.inWaiting())
                             result += newdata
                             self.status.set(_('Downloaded %d bytes'), len(result))
-                            self.replace_text(result.encode())
+                            self.replace_text(result.decode())
                             sleep(sleeptime) # TODO determine sleep time from baudrate
                         mc.close()
                         showinfo(_('Success!'),