From 3d2ce651e8a4f818c26224566247480e0523feaa Mon Sep 17 00:00:00 2001
From: elias <elias@java.net>
Date: Thu, 10 Aug 2006 08:05:14 +0000
Subject: [PATCH] DirectInput: Ignore unmapped components

---
 .../windows/src/java/net/java/games/input/DIControllers.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/windows/src/java/net/java/games/input/DIControllers.java b/plugins/windows/src/java/net/java/games/input/DIControllers.java
index 0d7f01f..cb4b2d6 100644
--- a/plugins/windows/src/java/net/java/games/input/DIControllers.java
+++ b/plugins/windows/src/java/net/java/games/input/DIControllers.java
@@ -52,13 +52,15 @@ final class DIControllers {
 		if (!device.getNextEvent(di_event))
 			return false;
 		DIDeviceObject object = device.mapEvent(di_event);
+		DIComponent component = device.mapObject(object);
+		if (component == null)
+			return false;
 		int event_value;
 		if (object.isRelative()) {
 			event_value = object.getRelativeEventValue(di_event.getData());
 		} else {
 			event_value = di_event.getData();
 		}
-		DIComponent component = device.mapObject(object);
 		event.set(component, component.getDeviceObject().convertValue(event_value), di_event.getNanos());
 		return true;
 	}