From 9d2b6f88547f7944154737fb0e911a170e1c6f6d Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Thu, 28 Jan 2016 13:02:30 -0500
Subject: [PATCH] Make nextDeviceId non-static since the lifetime of
 ControllerHandler is also just the life of the connection

---
 .../com/limelight/binding/input/driver/UsbDriverService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java b/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java
index 97d23e64..f89500c8 100644
--- a/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java
+++ b/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java
@@ -31,7 +31,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {
     private final ArrayList<AbstractController> controllers = new ArrayList<>();
 
     private UsbDriverListener listener;
-    private static int nextDeviceId;
+    private int nextDeviceId;
 
     @Override
     public void reportControllerState(int controllerId, short buttonFlags, float leftStickX, float leftStickY, float rightStickX, float rightStickY, float leftTrigger, float rightTrigger) {