diff options
| author | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 17:19:29 +0000 |
|---|---|---|
| committer | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 17:19:29 +0000 |
| commit | 66c51f716433a3bf9fb0a5547919df61f040f7cd (patch) | |
| tree | 4f7463cb2d5022a787651465fb939d1ef89e7aa3 /chrome/browser/service | |
| parent | bb268a6f7560ed68ff67bb162b1f528012164fbe (diff) | |
| download | chromium_src-66c51f716433a3bf9fb0a5547919df61f040f7cd.zip chromium_src-66c51f716433a3bf9fb0a5547919df61f040f7cd.tar.gz chromium_src-66c51f716433a3bf9fb0a5547919df61f040f7cd.tar.bz2 | |
Fix crash on launch when remoting lab is turned on on Windows.
BUG=58888
TEST=turn on remoting in labs, quit chrome, make sure service process isn't running, launch chrome. Shouldn't crash.
Review URL: http://codereview.chromium.org/3704003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/service')
| -rw-r--r-- | chrome/browser/service/service_process_control.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc index 49702d1..08a1c9f 100644 --- a/chrome/browser/service/service_process_control.cc +++ b/chrome/browser/service/service_process_control.cc @@ -135,6 +135,14 @@ void ServiceProcessControl::Launch(Task* task) { return; } + // Prevent quick calls to Launch in succession from causing a crash. + // TODO(scottbyer) - ServiceProcessControl launch task callback code needs to + // be enhanced to deal with this properly. See + // http://code.google.com/p/chromium/issues/detail?id=58802 + if (launcher_) { + return; + } + // A service process should have a different mechanism for starting, but now // we start it as if it is a child process. FilePath exe_path = ChildProcessHost::GetChildPath(true); |