Chromium Code Reviews| Index: remoting/host/linux/linux_me2me_host.py |
| diff --git a/remoting/host/linux/linux_me2me_host.py b/remoting/host/linux/linux_me2me_host.py |
| index 525af8c0aa480a75b0ba9d34610ef5a80da6a700..a461ffb9135ce0645cf86a06971a885a14fbb3b6 100755 |
| --- a/remoting/host/linux/linux_me2me_host.py |
| +++ b/remoting/host/linux/linux_me2me_host.py |
| @@ -780,9 +780,13 @@ def cleanup(): |
| global g_desktops |
| for desktop in g_desktops: |
| - if desktop.x_proc: |
| - logging.info("Terminating Xvfb") |
| - desktop.x_proc.terminate() |
| + for proc, name in [(desktop.x_proc, "Xvfb"), |
| + (desktop.session_proc, "session"), |
| + (desktop.host_proc, "host")]: |
| + if proc is not None: |
| + logging.info("Terminating " + name) |
| + proc.terminate() |
|
rmsousa
2014/10/07 23:01:36
Since we're changing this logic, should we also wa
Lambros
2014/10/08 01:30:53
Done.
|
| + |
| g_desktops = [] |
| if ParentProcessLogger.instance(): |
| ParentProcessLogger.instance().release_parent() |