Merge branch 'development' into fix/package-json-author

Author: paulhazen

com.playeveryware.eos/Runtime/Core/EOSManager.cs

@@ -100,7 +100,7 @@ public partial class EOSManager : MonoBehaviour, IEOSCoroutineOwner
         // <value>If true, EOSManager initialized itself at startup.</value>
         public bool InitializeOnAwake = true;
 
-        /// <value>If true, EOSManager will shutdown the EOS SDK when Unity dispatches OnApplicationQuit. </value>
+        /// <value>If true, EOSManager will shutdown the EOS SDK when Unity runs <see cref="Application.quitting"/>.</value>
         public bool ShouldShutdownOnApplicationQuit = true;
 
 #if !EOS_DISABLE
@@ -1812,20 +1812,6 @@ void Update()
             Instance.Tick();
         }
 
-        //-------------------------------------------------------------------------
-        /// <summary>Unity [OnApplicationQuit](https://docs.unity3d.com/ScriptReference/MonoBehaviour.OnApplicationQuit.html) is called before the application quits.
-        /// <list type="bullet">
-        ///     <item><description>Calls <c>OnShutdown()</c></description></item>
-        /// </list>
-        /// </summary>
-        private void OnApplicationQuit()
-        {
-            if (ShouldShutdownOnApplicationQuit)
-            {
-                Instance.OnShutdown();
-            }
-        }
-
         //-------------------------------------------------------------------------
         /// <summary>Unity [OnApplicationFocus](https://docs.unity3d.com/ScriptReference/MonoBehaviour.OnApplicationFocus.html) is called when the application loses or gains focus.
         /// <list type="bullet">
@@ -1847,6 +1833,51 @@ void OnApplicationPause(bool pauseStatus)
         {
             Instance.OnApplicationPause(pauseStatus);
         }
+
+        /// <summary>
+        /// Whenever the EOSManager becomes available and active, it subscribes
+        /// to [Application.quitting](https://docs.unity3d.com/ScriptReference/Application-quitting.html).
+        /// The event will only run when the application is definitely closing without the ability for it to be canceled.
+        /// </summary>
+        void OnEnable()
+        {
+            Application.quitting += OnApplicationQuitting;
+        }
+
+        /// <summary>
+        /// Whenever the EOSManager becomes inactive, it unsubscribes to 
+        /// to [Application.quitting](https://docs.unity3d.com/ScriptReference/Application-quitting.html).
+        /// This is in case the manager is unloaded without the application ending.
+        /// </summary>
+        void OnDisable()
+        {
+            Application.quitting -= OnApplicationQuitting;
+        }
+
+        /// <summary>
+        /// Event that should be subscribed to Application.quitting, with the event
+        /// managed by <see cref="OnEnable"/> and <see cref="OnDisable"/>.
+        /// This is intentionally named to be different than "OnApplicationQuit", which is a Unity Message
+        /// that runs when Unity begins considering quitting.
+        /// Instead, this should be subscribed to <see cref="Application.quitting"/>, which is an event
+        /// that only fires when the Application is irreversably shutting down.
+        /// </summary>
+        void OnApplicationQuitting()
+        {
+            if (ShouldShutdownOnApplicationQuit)
+            {
+#if EOS_CAN_SHUTDOWN
+                print($"{nameof(EOSManager)} ({nameof(OnApplicationQuitting)}): Application is quitting. {nameof(ShouldShutdownOnApplicationQuit)} is true, so the plugin is being shut down. EOS_CAN_SHUTDOWN is true, so the EOS SDK will now be shut down fully.");
+#else
+                print($"{nameof(EOSManager)} ({nameof(OnApplicationQuitting)}): Application is quitting. {nameof(ShouldShutdownOnApplicationQuit)} is true, so the plugin is being shut down. EOS_CAN_SHUTDOWN is false, so the EOS SDK will not be shut down.");
+#endif
+                Instance.OnShutdown();
+            }
+            else
+            {
+                print($"{nameof(EOSManager)} ({nameof(OnApplicationQuitting)}): Application is quitting. {nameof(ShouldShutdownOnApplicationQuit)} is false, so this manager will not shut down the EOS SDK.");
+            }
+        }
 #endif
 
         //-------------------------------------------------------------------------