From 4ea667a0b0de41d27dced59df7c67402deb73a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Tue, 17 Jan 2006 16:14:53 +0000
Subject: [PATCH] Fixed possible crashing bug for B_NO_POINTER_HISTORY views.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15998 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/servers/app/EventDispatcher.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/servers/app/EventDispatcher.cpp b/src/servers/app/EventDispatcher.cpp
index 7363fd2a13..9022e8ca87 100644
--- a/src/servers/app/EventDispatcher.cpp
+++ b/src/servers/app/EventDispatcher.cpp
@@ -565,9 +565,10 @@ EventDispatcher::_AddTokens(BMessage* message, EventTarget* target,
 		if ((listener->EffectiveEventMask() & eventMask) == 0)
 			continue;
 
-		if (nextMouseMoved != NULL
+		if (nextMouseMoved != NULL && message->what == B_MOUSE_MOVED
 			&& (listener->EffectiveOptions() & B_NO_POINTER_HISTORY) != 0
-			&& message != nextMouseMoved) {
+			&& message != nextMouseMoved
+			&& _viewToken != NULL) {
 			if (listener->token == *_viewToken) {
 				// focus view doesn't want to get pointer history
 				*_viewToken = B_NULL_TOKEN;