Skip to content

FIX: OnScreenStick leaking when destroyed #2006

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
merged 2 commits into from
Sep 16, 2024
Merged

FIX: OnScreenStick leaking when destroyed #2006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ece5b2
FIX: OnScreenStick leaking
ekcoh Sep 13, 2024
e0bdcc7
Merge branch 'develop' into isxb-1070-onscreenstick-memory-leak-fix
ekcoh Sep 16, 2024
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
1 change: 1 addition & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ however, it has to be formatted properly to pass verification tests.

### Fixed
- Fixed Multiple interactions could breaks on Composite Binding. [ISXB-619](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-619)
- Fixed memory leak when the OnScreenStick component was destroyed [ISXB-1070](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1070). Contribution by [LukeUnityDev](https://github.com/LukeUnityDev).

### Changed
- Renamed editor Resources directories to PackageResources to fix package validation warnings.
Expand Down
9 changes: 9 additions & 0 deletions Packages/com.unity.inputsystem/InputSystem/Plugins/OnScreen/OnScreenStick.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,15 @@ private void Start()
image.alphaHitTestMinimumThreshold = 0.5f;
}

private void OnDestroy()
{
if (m_UseIsolatedInputActions)
{
m_PointerDownAction.started -= OnPointerDown;
m_PointerDownAction.canceled -= OnPointerUp;
}
}

private void BeginInteraction(Vector2 pointerPosition, Camera uiCamera)
{
var canvasRectTransform = UGUIOnScreenControlUtils.GetCanvasRectTransform(transform);
Expand Down