diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 23:15:40 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 23:15:40 +0000 |
| commit | 1af07b4c2b17e8fdb430d696b0633c5a6ea445d6 (patch) | |
| tree | 9f4cf595710cb9f6314a6db4258a9d3177d5f578 | |
| parent | 2fdceb2533b8139dc1c52448691504bd9c1999bf (diff) | |
| download | chromium_src-1af07b4c2b17e8fdb430d696b0633c5a6ea445d6.zip chromium_src-1af07b4c2b17e8fdb430d696b0633c5a6ea445d6.tar.gz chromium_src-1af07b4c2b17e8fdb430d696b0633c5a6ea445d6.tar.bz2 | |
Don't restart the host when shutting down.
Small correction for crrev.com/133106 : RestartOnHostShutdown() should
not try restarting the host if Shutdown() was called after RestartHost().
Review URL: http://codereview.chromium.org/10165013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133298 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | remoting/host/remoting_me2me_host.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index fc3ad37..96ea3d2 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -350,6 +350,9 @@ class HostProcess void RestartOnHostShutdown() { DCHECK(context_->network_message_loop()->BelongsToCurrentThread()); + if (shutting_down_) + return; + restarting_ = false; host_ = NULL; log_to_server_.reset(); @@ -364,6 +367,7 @@ class HostProcess if (shutting_down_) return; + shutting_down_ = true; exit_code_ = exit_code; host_->Shutdown(base::Bind( |