diff options
author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 02:34:33 +0000 |
---|---|---|
committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 02:34:33 +0000 |
commit | fbec2b043867e69cf75476fa79586094def3672a (patch) | |
tree | b85cd9d61afdb66dd49b6c0a26664861a0ea489b /ash/system | |
parent | 8d6d7865dfd751f621fd14632d5eac9762789dba (diff) | |
download | chromium_src-fbec2b043867e69cf75476fa79586094def3672a.zip chromium_src-fbec2b043867e69cf75476fa79586094def3672a.tar.gz chromium_src-fbec2b043867e69cf75476fa79586094def3672a.tar.bz2 |
Fix the crashing in BluetoothDetailedView destructor.
BUG=174365
Review URL: https://chromiumcodereview.appspot.com/12213023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180871 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
-rw-r--r-- | ash/system/bluetooth/tray_bluetooth.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc index 842a7be..bdb9428 100644 --- a/ash/system/bluetooth/tray_bluetooth.cc +++ b/ash/system/bluetooth/tray_bluetooth.cc @@ -115,7 +115,7 @@ class BluetoothDetailedView : public TrayDetailsView, void BluetoothStopDiscovering() { ash::SystemTrayDelegate* delegate = ash::Shell::GetInstance()->system_tray_delegate(); - if (bluetooth_discovering_) { + if (delegate && bluetooth_discovering_) { bluetooth_discovering_ = false; delegate->BluetoothStopDiscovering(); throbber_->Stop(); |