Skip to content

Fixed bug where m_initCount was set to 0 after initialization #786

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
ITR13 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed bug where m_initCount was set to 0 after initialization #786

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
21 changes: 13 additions & 8 deletions com.rlabrecque.steamworks.net/Runtime/CallbackDispatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,19 @@ private static void DefaultExceptionHandler(Exception e) {
private static IntPtr m_pCallbackMsg;
private static int m_initCount;

#if UNITY_2019_3_OR_NEWER
// In case of disabled Domain Reload, reset static members before entering Play Mode.
[UnityEngine.RuntimeInitializeOnLoadMethod(UnityEngine.RuntimeInitializeLoadType.SubsystemRegistration)]
private static void InitOnPlayMode()
{
m_initCount = 0;
}
#endif
#if UNITY_2019_3_OR_NEWER && UNITY_EDITOR
// In case of disabled Domain Reload, reset static members before entering Play Mode.
[UnityEngine.RuntimeInitializeOnLoadMethod(UnityEngine.RuntimeInitializeLoadType.SubsystemRegistration)]
private static void InitOnPlayMode()
{
var hasDomainReloadDisabled = UnityEditor.EditorSettings.enterPlayModeOptionsEnabled &&
UnityEditor.EditorSettings.enterPlayModeOptions.HasFlag(UnityEditor.EnterPlayModeOptions.DisableDomainReload);
if (hasDomainReloadDisabled)
{
m_initCount = 0;
}
}
#endif

public static bool IsInitialized {
get { return m_initCount > 0; }
Expand Down