diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 10:38:47 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 10:38:47 +0000 |
| commit | d72ea767ef84b8518553ba1586059cd60121fe3c (patch) | |
| tree | 991556de8b6f5965c427b10918fbe0ad2f15e12c | |
| parent | f0dae70bb6d29defa7ad08d22f4886027a4f03ee (diff) | |
| download | chromium_src-d72ea767ef84b8518553ba1586059cd60121fe3c.zip chromium_src-d72ea767ef84b8518553ba1586059cd60121fe3c.tar.gz chromium_src-d72ea767ef84b8518553ba1586059cd60121fe3c.tar.bz2 | |
Tear down service IPC channel before creating a new one.
BUG=74820
TEST=Start Chrome and enable Chromoting. Restart Chromer and open Preferences, and check that Remoting is correctly detected as enabled.
Review URL: http://codereview.chromium.org/6612028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76903 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/service/service_ipc_server.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/service/service_ipc_server.cc b/chrome/service/service_ipc_server.cc index 5257eec..7542e37 100644 --- a/chrome/service/service_ipc_server.cc +++ b/chrome/service/service_ipc_server.cc @@ -24,6 +24,7 @@ bool ServiceIPCServer::Init() { } void ServiceIPCServer::CreateChannel() { + channel_.reset(NULL); // Tear down the existing channel, if any. channel_.reset(new IPC::SyncChannel(channel_handle_, IPC::Channel::MODE_NAMED_SERVER, this, g_service_process->io_thread()->message_loop(), true, |