From 431ed6bc5da3eb5228af5753763dc3a574a37875 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 26 Feb 2020 20:17:22 -0800
Subject: [PATCH] Cancel the mouse emulation timer when the stream ends

---
 .../limelight/binding/input/ControllerHandler.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/src/main/java/com/limelight/binding/input/ControllerHandler.java b/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
index 030ede80..5d0ee81e 100644
--- a/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
+++ b/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
@@ -162,11 +162,25 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         for (int i = 0; i < inputDeviceContexts.size(); i++) {
             InputDeviceContext deviceContext = inputDeviceContexts.valueAt(i);
 
+            if (deviceContext.mouseEmulationTimer != null) {
+                deviceContext.mouseEmulationTimer.cancel();
+                deviceContext.mouseEmulationTimer = null;
+            }
+
             if (deviceContext.vibrator != null) {
                 deviceContext.vibrator.cancel();
             }
         }
 
+        for (int i = 0; i < usbDeviceContexts.size(); i++) {
+            UsbDeviceContext deviceContext = usbDeviceContexts.valueAt(i);
+
+            if (deviceContext.mouseEmulationTimer != null) {
+                deviceContext.mouseEmulationTimer.cancel();
+                deviceContext.mouseEmulationTimer = null;
+            }
+        }
+
         deviceVibrator.cancel();
     }