diff options
| author | keybuk@google.com <keybuk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 18:34:51 +0000 |
|---|---|---|
| committer | keybuk@google.com <keybuk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 18:34:51 +0000 |
| commit | 60c6d1966d1f5ec87a1979cb76e1391d4ec805b3 (patch) | |
| tree | 83370af8c275e5966ed89cdce2e1f47e027504b1 | |
| parent | 5cdd2bfd400c269301786ac2bca35a42a5c9271e (diff) | |
| download | chromium_src-60c6d1966d1f5ec87a1979cb76e1391d4ec805b3.zip chromium_src-60c6d1966d1f5ec87a1979cb76e1391d4ec805b3.tar.gz chromium_src-60c6d1966d1f5ec87a1979cb76e1391d4ec805b3.tar.bz2 | |
bluetooth: guard adapter_ in destructor
Since we don't set adapter_ early, it's possible for the destructor
to be called without it ever being initialized. Guard that call.
BUG=none
TEST=emerge chromeos-chrome
Change-Id: I64724c3bf7272b9d5588713872627462ebcbe878
R=jhawkins@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9702076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126946 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc index 5ae0a95..56a2a7d 100644 --- a/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc +++ b/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc @@ -59,7 +59,8 @@ BluetoothOptionsHandler::~BluetoothOptionsHandler() { return; } - adapter_->RemoveObserver(this); + if (adapter_.get()) + adapter_->RemoveObserver(this); } void BluetoothOptionsHandler::GetLocalizedValues( |