Skip to content

fix(Lifecycle): detach native listeners on scene unload #323

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
ifBars merged 2 commits into from
Sep 25, 2026
Merged

fix(Lifecycle): detach native listeners on scene unload #323

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d519981
fix(Lifecycle): detach native listeners on scene unload
ifBars Sep 24, 2026
f1be386
fix(Lifecycle): retain pre-scene listener through menu reload
ifBars Sep 25, 2026
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
64 changes: 52 additions & 12 deletions S1API/Lifecycle/GameLifecycle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ namespace S1API.Lifecycle
public static class GameLifecycle
{
private static bool _initialized;
private static S1Persistence.LoadManager? _loadManager;
private static S1Persistence.LoadManager? _preSceneChangeManager;
private static S1Persistence.SaveManager? _saveManager;
private static UnityAction? _preLoadListener;
private static UnityAction? _loadCompleteListener;
private static UnityAction? _preSceneChangeListener;
private static UnityAction? _saveInfoLoadedListener;
private static UnityAction? _saveStartListener;
private static UnityAction? _saveCompleteListener;

/// <summary>
/// Fired before the game begins loading saved data.
Expand Down Expand Up @@ -151,21 +160,37 @@ internal static void Initialize()
return;

#if IL2CPPMELON
loadManager.onPreLoad.AddListener((UnityAction)InvokeOnPreLoad);
loadManager.onLoadComplete.AddListener((UnityAction)InvokeOnLoadComplete);
loadManager.onPreSceneChange.AddListener((UnityAction)InvokeOnPreSceneChange);
loadManager.onSaveInfoLoaded.AddListener((UnityAction)InvokeOnSaveInfoLoaded);
saveManager.onSaveStart.AddListener((UnityAction)InvokeOnSaveStart);
saveManager.onSaveComplete.AddListener((UnityAction)InvokeOnSaveComplete);
_preLoadListener ??= (UnityAction)InvokeOnPreLoad;
_loadCompleteListener ??= (UnityAction)InvokeOnLoadComplete;
_preSceneChangeListener ??= (UnityAction)InvokeOnPreSceneChange;
_saveInfoLoadedListener ??= (UnityAction)InvokeOnSaveInfoLoaded;
_saveStartListener ??= (UnityAction)InvokeOnSaveStart;
_saveCompleteListener ??= (UnityAction)InvokeOnSaveComplete;
#elif MONOMELON
loadManager.onPreLoad.AddListener(new UnityAction(InvokeOnPreLoad));
loadManager.onLoadComplete.AddListener(new UnityAction(InvokeOnLoadComplete));
loadManager.onPreSceneChange.AddListener(new UnityAction(InvokeOnPreSceneChange));
loadManager.onSaveInfoLoaded.AddListener(new UnityAction(InvokeOnSaveInfoLoaded));
saveManager.onSaveStart.AddListener(new UnityAction(InvokeOnSaveStart));
saveManager.onSaveComplete.AddListener(new UnityAction(InvokeOnSaveComplete));
_preLoadListener ??= new UnityAction(InvokeOnPreLoad);
_loadCompleteListener ??= new UnityAction(InvokeOnLoadComplete);
_preSceneChangeListener ??= new UnityAction(InvokeOnPreSceneChange);
_saveInfoLoadedListener ??= new UnityAction(InvokeOnSaveInfoLoaded);
_saveStartListener ??= new UnityAction(InvokeOnSaveStart);
_saveCompleteListener ??= new UnityAction(InvokeOnSaveComplete);
#endif

loadManager.onPreLoad.AddListener(_preLoadListener);
loadManager.onLoadComplete.AddListener(_loadCompleteListener);
if (_preSceneChangeManager != loadManager)
{
if (_preSceneChangeManager != null)
_preSceneChangeManager.onPreSceneChange.RemoveListener(_preSceneChangeListener);

loadManager.onPreSceneChange.AddListener(_preSceneChangeListener);
_preSceneChangeManager = loadManager;
}
loadManager.onSaveInfoLoaded.AddListener(_saveInfoLoadedListener);
saveManager.onSaveStart.AddListener(_saveStartListener);
saveManager.onSaveComplete.AddListener(_saveCompleteListener);

_loadManager = loadManager;
_saveManager = saveManager;
_initialized = true;
}

Expand All @@ -175,6 +200,21 @@ internal static void Initialize()
/// </summary>
internal static void Reset()
{
if (_loadManager != null)
{
_loadManager.onPreLoad.RemoveListener(_preLoadListener);
_loadManager.onLoadComplete.RemoveListener(_loadCompleteListener);
_loadManager.onSaveInfoLoaded.RemoveListener(_saveInfoLoadedListener);
}

if (_saveManager != null)
{
_saveManager.onSaveStart.RemoveListener(_saveStartListener);
_saveManager.onSaveComplete.RemoveListener(_saveCompleteListener);
}

_loadManager = null;
_saveManager = null;
_initialized = false;
}

Expand Down
Loading