| Index: gpu/ipc/service/gpu_watchdog_thread.cc
|
| diff --git a/gpu/ipc/service/gpu_watchdog_thread.cc b/gpu/ipc/service/gpu_watchdog_thread.cc
|
| index 4c8c04c9f38118594eddc21106674aecc468428b..da8bc9eae907130a097ecdc2107c89ad495bd099 100644
|
| --- a/gpu/ipc/service/gpu_watchdog_thread.cc
|
| +++ b/gpu/ipc/service/gpu_watchdog_thread.cc
|
| @@ -152,7 +152,8 @@ GpuWatchdogThread::~GpuWatchdogThread() {
|
| XCloseDisplay(display_);
|
| #endif
|
|
|
| - watched_message_loop_->RemoveTaskObserver(&task_observer_);
|
| + if (base::MessageLoop::current())
|
| + watched_message_loop_->RemoveTaskObserver(&task_observer_);
|
| }
|
|
|
| void GpuWatchdogThread::OnAcknowledge() {
|
|
|