Revert "Work around userscript crash issue"
This reverts commit 73ff2afb3f
.
Doesn't seem to help, at least for pkill9...
This commit is contained in:
parent
73ff2afb3f
commit
a49adc6298
@ -130,7 +130,6 @@ Fixed
|
|||||||
- (QtWebEngine) HTML fullscreen is now tracked for each tab separately, which
|
- (QtWebEngine) HTML fullscreen is now tracked for each tab separately, which
|
||||||
means it's not possible anymore to accidentally get stuck in fullscreen state
|
means it's not possible anymore to accidentally get stuck in fullscreen state
|
||||||
by closing a tab with a fullscreen video.
|
by closing a tab with a fullscreen video.
|
||||||
- For some people, running some userscripts crashed - this should now be fixed.
|
|
||||||
- Various other rare crashes should now be fixed.
|
- Various other rare crashes should now be fixed.
|
||||||
- The settings documentation was truncated with v0.10.1 which should now be
|
- The settings documentation was truncated with v0.10.1 which should now be
|
||||||
fixed.
|
fixed.
|
||||||
|
@ -40,7 +40,6 @@ class _QtFIFOReader(QObject):
|
|||||||
_filepath: The path to the opened FIFO.
|
_filepath: The path to the opened FIFO.
|
||||||
_fifo: The Python file object for the FIFO.
|
_fifo: The Python file object for the FIFO.
|
||||||
_notifier: The QSocketNotifier used.
|
_notifier: The QSocketNotifier used.
|
||||||
_finished: Set after cleanup() has been called.
|
|
||||||
|
|
||||||
Signals:
|
Signals:
|
||||||
got_line: Emitted when a whole line arrived.
|
got_line: Emitted when a whole line arrived.
|
||||||
@ -60,18 +59,11 @@ class _QtFIFOReader(QObject):
|
|||||||
self._fifo = os.fdopen(fd, 'r')
|
self._fifo = os.fdopen(fd, 'r')
|
||||||
self._notifier = QSocketNotifier(fd, QSocketNotifier.Read, self)
|
self._notifier = QSocketNotifier(fd, QSocketNotifier.Read, self)
|
||||||
self._notifier.activated.connect(self.read_line)
|
self._notifier.activated.connect(self.read_line)
|
||||||
self._finished = False
|
|
||||||
|
|
||||||
@pyqtSlot()
|
@pyqtSlot()
|
||||||
def read_line(self):
|
def read_line(self):
|
||||||
"""(Try to) read a line from the FIFO."""
|
"""(Try to) read a line from the FIFO."""
|
||||||
log.procs.debug("QSocketNotifier triggered!")
|
log.procs.debug("QSocketNotifier triggered!")
|
||||||
if self._finished:
|
|
||||||
# For unknown reasons, read_line can still get called after
|
|
||||||
# cleanup() was, and the QSocketNotifier was already deleted...
|
|
||||||
log.procs.debug("QtFIFOReader finished already...")
|
|
||||||
return
|
|
||||||
|
|
||||||
self._notifier.setEnabled(False)
|
self._notifier.setEnabled(False)
|
||||||
try:
|
try:
|
||||||
for line in self._fifo:
|
for line in self._fifo:
|
||||||
@ -83,7 +75,6 @@ class _QtFIFOReader(QObject):
|
|||||||
|
|
||||||
def cleanup(self):
|
def cleanup(self):
|
||||||
"""Clean up so the FIFO can be closed."""
|
"""Clean up so the FIFO can be closed."""
|
||||||
self._finished = True
|
|
||||||
self._notifier.setEnabled(False)
|
self._notifier.setEnabled(False)
|
||||||
for line in self._fifo:
|
for line in self._fifo:
|
||||||
self.got_line.emit(line.rstrip('\r\n'))
|
self.got_line.emit(line.rstrip('\r\n'))
|
||||||
|
Loading…
Reference in New Issue
Block a user