Merge pull request #144 from EpicGames/master

Improve input unregistering
EpicGames · Mar 9, 2023 · 9de209d · 9de209d
2 parents 7a9ed96 + 2476233
commit 9de209d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/Frontend/library/src/AFK/AFKController.ts b/Frontend/library/src/AFK/AFKController.ts
@@ -76,7 +76,7 @@ export class AFKController {
     stopAfkWarningTimer() {
         this.active = false;
         this.countdownActive = false;
-        clearInterval(this.warnTimer);
+        clearTimeout(this.warnTimer);
         clearInterval(this.countDownTimer);
     }
 

diff --git a/Frontend/library/src/Inputs/MouseController.ts b/Frontend/library/src/Inputs/MouseController.ts
@@ -134,6 +134,15 @@ export class MouseController {
         this.mouseEventListenerTracker.addUnregisterCallback(
             () => lockedMouseEvents.unregisterMouseEvents()
         );
+        this.mouseEventListenerTracker.addUnregisterCallback(() => {
+            if (
+                document.exitPointerLock &&
+                (document.pointerLockElement === videoElementParent ||
+                    document.mozPointerLockElement === videoElementParent)
+            ) {
+                document.exitPointerLock();
+            }
+        });
     }
 
     /**

diff --git a/Frontend/library/src/WebRtcPlayer/WebRtcPlayerController.ts b/Frontend/library/src/WebRtcPlayer/WebRtcPlayerController.ts
@@ -209,6 +209,12 @@ export class WebRtcPlayerController {
             if (this.statsTimerHandle && this.statsTimerHandle !== undefined) {
                 window.clearInterval(this.statsTimerHandle);
             }
+
+            // unregister all input device event handlers on disconnect
+            this.setTouchInputEnabled(false);
+            this.setMouseInputEnabled(false);
+            this.setKeyboardInputEnabled(false);
+            this.setGamePadInputEnabled(false);
         });
 
         // set up the final webRtc player controller methods from within our application so a connection can be activated
@@ -1514,14 +1520,14 @@ export class WebRtcPlayerController {
      * Close the Connection to the signaling server
      */
     closeSignalingServer() {
-        this.webSocketController.close();
+        this.webSocketController?.close();
     }
 
     /**
      * Close the peer connection
      */
     closePeerConnection() {
-        this.peerConnectionController.close();
+        this.peerConnectionController?.close();
     }
 
     /**

diff --git a/Frontend/library/src/WebSockets/WebSocketController.ts b/Frontend/library/src/WebSockets/WebSocketController.ts
@@ -201,7 +201,7 @@ export class WebSocketController {
      * Closes the Websocket connection
      */
     close() {
-        this.webSocket.close();
+        this.webSocket?.close();
     }
 
     /** Event used for Displaying websocket closed messages */