Index: mash/quick_launch/quick_launch.cc |
diff --git a/mash/quick_launch/quick_launch.cc b/mash/quick_launch/quick_launch.cc |
index 9948a8954a4f1f6e489bb451c81357a0810ee32a..a9f51a0f68099f91fe6726a8eb874f8a2c8c5c00 100644 |
--- a/mash/quick_launch/quick_launch.cc |
+++ b/mash/quick_launch/quick_launch.cc |
@@ -175,6 +175,14 @@ void QuickLaunch::OnStart() { |
context()->connector(), context()->identity(), "views_mus_resources.pak", |
std::string(), nullptr, views::AuraInit::Mode::AURA_MUS); |
+ // If AuraInit was unable to initialize there is no longer a peer connection. |
+ // The ServiceManager is in the process of shutting down, however we haven't |
+ // been notified yet. Close our ServiceContext and shutdown. |
+ if (!aura_init_->initialized()) { |
+ context()->QuitNow(); |
+ return; |
+ } |
+ |
Launch(mojom::kWindow, mojom::LaunchMode::MAKE_NEW); |
} |