Revert "Remove test_ipc workaround again."

This reverts commit f4d2e0746e.
2015-09-03 06:51:15 +02:00 · 2015-09-03 06:51:15 +02:00 · 3a5cd8f3ff
commit 3a5cd8f3ff
parent 46b28387db
1 changed files with 4 additions and 0 deletions
--- a/qutebrowser/misc/ipc.py
+++ b/qutebrowser/misc/ipc.py
@ -140,6 +140,10 @@ class IPCServer(QObject):
    @pyqtSlot(int)
    def on_error(self, err):
        """Convenience method which calls _socket_error on an error."""
+        if self._socket is None:
+            # Sometimes this gets called from stale sockets, especially in
+            # tests.
+            return
        self._timer.stop()
        log.ipc.debug("Socket error {}: {}".format(
            self._socket.error(), self._socket.errorString()))