diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 21:12:02 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 21:12:02 +0000 |
| commit | 19de90f0acda975a59c8e1fd3be212246bc15dcc (patch) | |
| tree | 8955a87a05a15542af08a6f06ae0b07b83a51c01 | |
| parent | 822e2947f42a96cc29771f15013fe324037a9712 (diff) | |
| download | chromium_src-19de90f0acda975a59c8e1fd3be212246bc15dcc.zip chromium_src-19de90f0acda975a59c8e1fd3be212246bc15dcc.tar.gz chromium_src-19de90f0acda975a59c8e1fd3be212246bc15dcc.tar.bz2 | |
Crash fix.
BUG=http://code.google.com/p/chromium-os/issues/detail?id=8641
TEST=Disable cellular; enable cellular; activate cellular network. Verify no crash.
Review URL: http://codereview.chromium.org/4374003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64962 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/status/network_menu.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index f8b11de..70107ab 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -329,8 +329,9 @@ void NetworkMenu::ActivatedAt(int index) { // TODO(stevenjb): Show notification. } else if (cellular->activation_state() != ACTIVATION_STATE_ACTIVATED) { ActivateCellular(cellular); - } else if (cellular->service_path() == - cros->cellular_network()->service_path()) { + } else if (cros->cellular_network() && + (cellular->service_path() == + cros->cellular_network()->service_path())) { // Show the config settings for the cellular network. ShowCellular(cellular, false); } else { |