From 95c82c5cc5ecdbd434cf440b5189677229f8054d Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Thu, 12 Feb 2015 21:06:37 -0500
Subject: [PATCH] Fix a nasty bug in multiple controller support that could
 cause phantom inputs on controller 0

---
 .../com/limelight/nvstream/input/ControllerBatchingBlock.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/moonlight-common/src/com/limelight/nvstream/input/ControllerBatchingBlock.java b/moonlight-common/src/com/limelight/nvstream/input/ControllerBatchingBlock.java
index 25ecb985..64aeb4a1 100644
--- a/moonlight-common/src/com/limelight/nvstream/input/ControllerBatchingBlock.java
+++ b/moonlight-common/src/com/limelight/nvstream/input/ControllerBatchingBlock.java
@@ -14,6 +14,7 @@ public class ControllerBatchingBlock {
 	private short controllerNumber;
 	
 	public ControllerBatchingBlock(MultiControllerPacket initialPacket) {
+		this.controllerNumber = initialPacket.controllerNumber;
 		this.buttonFlags = initialPacket.buttonFlags;
 		this.leftTrigger = initialPacket.leftTrigger;
 		this.rightTrigger = initialPacket.rightTrigger;