summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome_frame/chrome_frame_delegate.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame_delegate.h b/chrome_frame/chrome_frame_delegate.h
index f8f812d..d4bdae0 100644
--- a/chrome_frame/chrome_frame_delegate.h
+++ b/chrome_frame/chrome_frame_delegate.h
@@ -197,7 +197,7 @@ template <class T> class TaskMarshallerThroughWindowsMessages
// had remained in the thread queue).
inline bool PopTask(Task* task) {
AutoLock lock(lock_);
- if (task == pending_tasks_.front()) {
+ if (!pending_tasks_.empty() && task == pending_tasks_.front()) {
pending_tasks_.pop();
return true;
}