rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do a final userscript command read on cleanup

Browse Source 
On OS X, sometimes the userscript exited before the QSocketNotifier was
triggered. By doing a final read when cleaning up we make sure we don't
miss anything.

Fixes #1533.
This commit is contained in:
Florian Bruhin 2016-05-29 18:35:43 +02:00
parent ca87b9e285
commit 5b84fc93df
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/commands/userscripts.py
View File

@ -71,6 +71,8 @@ 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._notifier.setEnabled(False) self._notifier.setEnabled(False)
for line in self._fifo:
self.got_line.emit(line.rstrip('\r\n'))
self._fifo.close() self._fifo.close()

2
tests/end2end/features/spawn.feature
View File

@ -30,7 +30,7 @@ Feature: :spawn
And I run :spawn echo {url:pretty} And I run :spawn echo {url:pretty}
Then "Executing echo with args ['http://localhost:(port)/data/title with spaces.html'], userscript=False" should be logged Then "Executing echo with args ['http://localhost:(port)/data/title with spaces.html'], userscript=False" should be logged
@linux @posix
Scenario: Running :spawn with userscript Scenario: Running :spawn with userscript
When I open about:blank When I open about:blank
And I execute the userscript open_current_url And I execute the userscript open_current_url