diff options
| author |  Dmytro Milinevskyy <milinevskyy@gmail.com> | 2010-02-26 02:09:28 +0200 |
|---|---|---|
| committer |  Mason Larobina <mason.larobina@gmail.com> | 2010-03-12 12:59:18 +0800 |
| commit | dd459eeaaa5da12ecc5d369b9df46092dc7cc97d (patch) | |
| tree | d989daa28ec0cfc43911846945a7dc48fec65760 | |
| parent | 9e2b394c7b5765e3ca7a1701048c60e95dbe65fb (diff) | |
[uzbl-tabbed] correctly wait for child uzbl-core when tab is closed
| -rwxr-xr-x | examples/data/scripts/uzbl-tabbed | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/examples/data/scripts/uzbl-tabbed b/examples/data/scripts/uzbl-tabbed index e3e890d..e542dbf 100755 --- a/examples/data/scripts/uzbl-tabbed +++ b/examples/data/scripts/uzbl-tabbed @@ -371,8 +371,9 @@ class SocketClient: class UzblInstance: '''Uzbl instance meta-data/meta-action object.''' - def __init__(self, parent, tab, name, uri, title, switch): + def __init__(self, parent, tab, name, uri, title, switch, process): + self.process = process self.parent = parent self.tab = tab self.name = name @@ -527,6 +528,7 @@ class UzblInstance: if self._client: self._client.close() self._client = None + self.process.wait() class UzblTabbed: @@ -994,9 +996,9 @@ class UzblTabbed: cmd = ['uzbl-browser', '-n', name, '-s', str(sid), '--connect-socket', self.socket_path, '--uri', uri] - subprocess.Popen(cmd) # TODO: do i need close_fds=True ? + process = subprocess.Popen(cmd) # TODO: do i need close_fds=True ? - uzbl = UzblInstance(self, tab, name, uri, title, switch) + uzbl = UzblInstance(self, tab, name, uri, title, switch, process) SocketClient.instances_queue[name] = uzbl self.tabs[tab] = uzbl |