Skip to content

ToggleRef: Add dispose method #1473

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

Open
badcel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ToggleRef: Add dispose method #1473

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
5 changes: 4 additions & 1 deletion src/Libs/GObject-2.0/Internal/InstanceCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,11 @@ public static unsafe void Remove(IntPtr handle)
{
lock (Cache)
{
if (Cache.Remove(handle))
if (Cache.Remove(handle, out var toggleRef))
{
toggleRef.Dispose();
ToggleRegistration.RemoveToggleRef(handle, &ToggleNotify);
}
}

Debug.WriteLine($"Handle {handle}: Removed object from {nameof(InstanceCache)}.");
Expand Down
14 changes: 13 additions & 1 deletion src/Libs/GObject-2.0/Internal/ToggleRef.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@

namespace GObject.Internal;

internal class ToggleRef
internal class ToggleRef : IDisposable
{
private object _reference;
private bool _disposed;

public GObject.Object? Object
{
get
{
if (!_disposed)
return null;

if (_reference is WeakReference weakRef)
return (GObject.Object?) weakRef.Target;

Expand All @@ -31,6 +35,9 @@ public ToggleRef(GObject.Object obj)

internal void ToggleReference(bool isLastRef)
{
if (_disposed)
return;

if (!isLastRef && _reference is WeakReference weakRef)
{
if (weakRef.Target is { } weakObj)
Expand All @@ -43,4 +50,9 @@ internal void ToggleReference(bool isLastRef)
_reference = new WeakReference(_reference);
}
}

public void Dispose()
{
_disposed = true;
}
}
Loading