Merge branch 'unicode-error' of https://github.com/fiete201/qutebrowser into fiete201-unicode-error

1 files changed, 6 insertions, 3 deletions

diff --git a/qutebrowser/commands/userscripts.py b/qutebrowser/commands/userscripts.py
index 3c1d4d89e..4cd96ba02 100644
--- a/qutebrowser/commands/userscripts.py
+++ b/qutebrowser/commands/userscripts.py
@@ -65,9 +65,12 @@ class _QtFIFOReader(QObject):
         """(Try to) read a line from the FIFO."""
         log.procs.debug("QSocketNotifier triggered!")
         self._notifier.setEnabled(False)
-        for line in self._fifo:
-            self.got_line.emit(line.rstrip('\r\n'))
-        self._notifier.setEnabled(True)
+        try:
+            for line in self._fifo:
+                self.got_line.emit(line.rstrip('\r\n'))
+                self._notifier.setEnabled(True)
+        except UnicodeDecodeError:
+            log.misc.error("Invalid unicode in userscript output")
 
     def cleanup(self):
         """Clean up so the FIFO can be closed."""