Fix: GraphyManager.OnDestroy() hides G_Singleton<T>.OnDestroy()

dmitry1100 · dmitry1100 · commit a3a655177d77 · 2024-01-23T21:51:09.000+03:00
diff --git a/Runtime/GraphyManager.cs b/Runtime/GraphyManager.cs
@@ -547,10 +547,12 @@ private void Start()
             Init();
         }
 
-        private void OnDestroy()
+        protected override void OnDestroy()
         {
             G_IntString.Dispose();
             G_FloatString.Dispose();
+
+            base.OnDestroy();
         }
 
         private void Update()
diff --git a/Runtime/Util/G_Singleton.cs b/Runtime/Util/G_Singleton.cs
@@ -59,7 +59,7 @@ public static T Instance
 
         #region Methods -> Unity Callbacks
 
-        void Awake()
+        protected virtual void Awake()
         {
             if( _instance != null )
             {
@@ -71,7 +71,7 @@ void Awake()
             }
         }
 
-        void OnDestroy()
+        protected virtual void OnDestroy()
         {
             if( _instance == this )
             {

Original file line number	Diff line number	Diff line change
`@@ -547,10 +547,12 @@ private void Start()`
`547`	`547`	`Init();`
`548`	`548`	`}`
`549`	`549`
`550`		`- private void OnDestroy()`
	`550`	`+ protected override void OnDestroy()`
`551`	`551`	`{`
`552`	`552`	`G_IntString.Dispose();`
`553`	`553`	`G_FloatString.Dispose();`
	`554`	`+`
	`555`	`+ base.OnDestroy();`
`554`	`556`	`}`
`555`	`557`
`556`	`558`	`private void Update()`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public static T Instance`
`59`	`59`
`60`	`60`	`#region Methods -> Unity Callbacks`
`61`	`61`
`62`		`- void Awake()`
	`62`	`+ protected virtual void Awake()`
`63`	`63`	`{`
`64`	`64`	`if( _instance != null )`
`65`	`65`	`{`
`@@ -71,7 +71,7 @@ void Awake()`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- void OnDestroy()`
	`74`	`+ protected virtual void OnDestroy()`
`75`	`75`	`{`
`76`	`76`	`if( _instance == this )`
`77`	`77`	`{`