1 files changed, 6 insertions, 0 deletions
diff --git a/base/message_pump_win.cc b/base/message_pump_win.cc
index 6be4e0f..d07b4f7 100644
--- a/base/message_pump_win.cc
+++ b/base/message_pump_win.cc
@@ -243,6 +243,12 @@ void MessagePumpWin::HandleWorkMessage() {
 void MessagePumpWin::HandleTimerMessage() {
   KillTimer(message_hwnd_, reinterpret_cast<UINT_PTR>(this));
 
+  // If we are being called outside of the context of Run, then don't do
+  // anything.  This could correspond to a MessageBox call or something of
+  // that sort.
+  if (!state_)
+    return;
+
   state_->delegate->DoDelayedWork();
 }