Skip to content

Commit 72e4f20

Browse files
fix: NetworkVariable dispose original internal (#3128)
* fix Assure we dispose the original internal value. * style adding some comments and formatting a bit.
1 parent 5d97c45 commit 72e4f20

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,19 +181,26 @@ public override void Dispose()
181181
}
182182

183183
m_IsDisposed = true;
184+
// Dispose the internal value
184185
if (m_InternalValue is IDisposable internalValueDisposable)
185186
{
186187
internalValueDisposable.Dispose();
187188
}
188-
189189
m_InternalValue = default;
190+
191+
// Dispose the internal original value
192+
if (m_InternalOriginalValue is IDisposable internalOriginalValueDisposable)
193+
{
194+
internalOriginalValueDisposable.Dispose();
195+
}
190196
m_InternalOriginalValue = default;
197+
198+
// Dispose the previous value if there is one
191199
if (m_HasPreviousValue && m_PreviousValue is IDisposable previousValueDisposable)
192200
{
193201
m_HasPreviousValue = false;
194202
previousValueDisposable.Dispose();
195203
}
196-
197204
m_PreviousValue = default;
198205

199206
base.Dispose();

0 commit comments

Comments
 (0)