Skip to content

fix: Fix NullReferenceException in InputRemoting #831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karasusan merged 1 commit into from
Jan 10, 2023
Merged

fix: Fix NullReferenceException in InputRemoting #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions WebApp/client/src/inputdevice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class InputDevice {
* name;
* layout;
* deviceId;
* variants;
* usages;
* description;
*
* _inputState;
Expand All @@ -54,14 +54,14 @@ export class InputDevice {
* @param {Number} name
* @param {String} layout
* @param {Number} deviceId
* @param {String} variants
* @param {String[]} usages
* @param {Object} description
*/
constructor(name, layout, deviceId, variants, description) {
constructor(name, layout, deviceId, usages, description) {
this.name = name;
this.layout = layout;
this.deviceId = deviceId;
this.variants = variants;
this.usages = usages;
this.description = description;

this._inputState = null;
Expand Down
8 changes: 4 additions & 4 deletions WebApp/client/src/sender.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class Sender extends LocalInputManager {
m_Version: "",
m_Capabilities: ""
};
this.mouse = new Mouse("Mouse", "Mouse", 1, "", descriptionMouse);
this.mouse = new Mouse("Mouse", "Mouse", 1, null, descriptionMouse);
this._devices.push(this.mouse);

this._elem.addEventListener('click', this._onMouseEvent.bind(this), false);
Expand All @@ -58,7 +58,7 @@ export class Sender extends LocalInputManager {
m_Version: "",
m_Capabilities: ""
};
this.keyboard = new Keyboard("Keyboard", "Keyboard", 2, "", descriptionKeyboard);
this.keyboard = new Keyboard("Keyboard", "Keyboard", 2, null, descriptionKeyboard);
this._devices.push(this.keyboard);

document.addEventListener('keyup', this._onKeyEvent.bind(this), false);
Expand All @@ -75,7 +75,7 @@ export class Sender extends LocalInputManager {
m_Version: "",
m_Capabilities: ""
};
this.gamepad = new Gamepad("Gamepad", "Gamepad", 3, "", descriptionGamepad);
this.gamepad = new Gamepad("Gamepad", "Gamepad", 3, null, descriptionGamepad);
this._devices.push(this.gamepad);

window.addEventListener("gamepadconnected", this._onGamepadEvent.bind(this), false);
Expand All @@ -94,7 +94,7 @@ export class Sender extends LocalInputManager {
m_Version: "",
m_Capabilities: ""
};
this.touchscreen = new Touchscreen("Touchscreen", "Touchscreen", 4, "", descriptionTouch);
this.touchscreen = new Touchscreen("Touchscreen", "Touchscreen", 4, null, descriptionTouch);
this._devices.push(this.touchscreen);

this._elem.addEventListener('touchend', this._onTouchEvent.bind(this), false);
Expand Down
5 changes: 3 additions & 2 deletions com.unity.renderstreaming/Runtime/Scripts/InputSystem/InputRemoting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,8 +653,9 @@ public static void Process(InputRemoting Receiver, Message msg)
var deviceFlagsRemote = 1 << 3;
device.SetDeviceFlags(device.GetDeviceFlags() | deviceFlagsRemote);

foreach (var usage in data.usages)
Receiver.m_LocalManager.AddDeviceUsage(device, usage);
if(data.usages != null)
foreach (var usage in data.usages)
Receiver.m_LocalManager.AddDeviceUsage(device, usage);

// Remember it.
var record = new RemoteInputDevice
Expand Down