Index: ash/accelerators/accelerator_dispatcher_linux.cc |
diff --git a/ash/accelerators/accelerator_dispatcher_linux.cc b/ash/accelerators/accelerator_dispatcher_linux.cc |
index 91fa80c57212b5bb4cc79c16a5f2eeb8ec48f06b..76a57672a9dd76ac30c2922209e9ff5c5bf38d2a 100644 |
--- a/ash/accelerators/accelerator_dispatcher_linux.cc |
+++ b/ash/accelerators/accelerator_dispatcher_linux.cc |
@@ -28,6 +28,8 @@ const int kModifierMask = (ui::EF_SHIFT_DOWN | |
base::MessagePumpDispatcher::DispatchStatus AcceleratorDispatcher::Dispatch( |
XEvent* xev) { |
+ if (!associated_window_) |
+ return EVENT_QUIT; |
if (!associated_window_->CanReceiveEvents()) |
return aura::RootWindow::GetInstance()->GetDispatcher()->Dispatch(xev); |