Commit a43a3ee8 authored by David Reveman's avatar David Reveman Committed by Commit Bot

exo: Fix tear down crash in Seat class.

Fix ExoParts destruction order to ensure that WMHelper instance
is valid when exo::Display is destroyed.

Bug: 788731
Test: Running Chrome with DCHECKs no longer fails at shutdown.
Change-Id: I9bddecd863d92b600378488e04612cff87cef1ae
Reviewed-on: https://chromium-review.googlesource.com/792214
Commit-Queue: David Reveman <reveman@chromium.org>
Reviewed-by: default avatarDaniele Castagna <dcastagna@chromium.org>
Cr-Commit-Position: refs/heads/master@{#519523}
parent 054b56e5
...@@ -57,6 +57,7 @@ WaylandServerController::CreateIfNecessary() { ...@@ -57,6 +57,7 @@ WaylandServerController::CreateIfNecessary() {
WaylandServerController::~WaylandServerController() { WaylandServerController::~WaylandServerController() {
wayland_watcher_.reset(); wayland_watcher_.reset();
wayland_server_.reset(); wayland_server_.reset();
display_.reset();
exo::WMHelper::SetInstance(nullptr); exo::WMHelper::SetInstance(nullptr);
wm_helper_.reset(); wm_helper_.reset();
} }
......
...@@ -150,6 +150,7 @@ std::unique_ptr<ExoParts> ExoParts::CreateIfNecessary() { ...@@ -150,6 +150,7 @@ std::unique_ptr<ExoParts> ExoParts::CreateIfNecessary() {
ExoParts::~ExoParts() { ExoParts::~ExoParts() {
wayland_watcher_.reset(); wayland_watcher_.reset();
wayland_server_.reset(); wayland_server_.reset();
display_.reset();
exo::WMHelper::SetInstance(nullptr); exo::WMHelper::SetInstance(nullptr);
wm_helper_.reset(); wm_helper_.reset();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment