diff options
| author | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-26 20:24:01 +0000 |
|---|---|---|
| committer | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-26 20:24:01 +0000 |
| commit | 1d25553defb7aa3fcc7bccbe0404ed464be7f6e8 (patch) | |
| tree | 9ebf148afd1084fe0abbc9949a253a196f200b98 /remoting | |
| parent | c2c3dba26fa3aa056b809f440a1a38fbcb79ca5f (diff) | |
| download | chromium_src-1d25553defb7aa3fcc7bccbe0404ed464be7f6e8.zip chromium_src-1d25553defb7aa3fcc7bccbe0404ed464be7f6e8.tar.gz chromium_src-1d25553defb7aa3fcc7bccbe0404ed464be7f6e8.tar.bz2 | |
Merge 167779 - Fixed start-up crash with curtain mode.
BUG=161087
Review URL: https://codereview.chromium.org/11365266
TBR=jamiewalch@google.com
Review URL: https://codereview.chromium.org/11299179
git-svn-id: svn://svn.chromium.org/chrome/branches/1312/src@169479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/remoting_me2me_host.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index d608f26..a695df2 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -676,7 +676,8 @@ bool HostProcess::OnCurtainPolicyUpdate(bool curtain_required) { else LOG(ERROR) << "Policy does not require curtain-mode."; curtain_required_ = curtain_required; - curtaining_host_observer_->SetEnableCurtaining(curtain_required_); + if (curtaining_host_observer_) + curtaining_host_observer_->SetEnableCurtaining(curtain_required_); return true; } return false; |