Skip to content

Commit

Permalink
Fixes crash in PanelLayoutManager
Browse files Browse the repository at this point in the history
During shutdown of sysui I was occasionally crashing in
PanelLayoutManager as the window was null.

BUG=594600
TEST=none
R=jamescook@chromium.org

Review-Url: https://codereview.chromium.org/2108383002
Cr-Commit-Position: refs/heads/master@{#403020}
  • Loading branch information
sky authored and Commit bot committed Jun 30, 2016
1 parent bcccbc9 commit e53dead
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ash/common/wm/panels/panel_layout_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ void PanelLayoutManager::RestorePanel(WmWindow* panel) {
}

void PanelLayoutManager::Relayout() {
if (!shelf_)
if (!shelf_ || !shelf_->GetWindow())
return;

// Suppress layouts during overview mode because changing window bounds
Expand Down

0 comments on commit e53dead

Please sign in to comment.