A rare bugfix when OnApplicationQuit is canceled by Application.wantsToQuit (closed #19)

Author: yasirkula

Plugins/DynamicPanels/Scripts/DynamicPanelsCanvas.cs

@@ -81,9 +81,17 @@ private bool PanelGroupHasAnyOtherPanels( PanelGroup group, Panel panel )
 				return false;
 			}
 
+			public void OnApplicationQuit()
+			{
+#if UNITY_2018_1_OR_NEWER
+				canvas.OnApplicationQuitting();
+#else
+				canvas.OnApplicationQuit();
+#endif
+			}
+
 			public void AnchorZonesSetActive( bool value ) { canvas.AnchorZonesSetActive( value ); }
 			public void ReceiveRaycasts( bool value ) { canvas.background.raycastTarget = value; }
-			public void OnApplicationQuit() { canvas.OnApplicationQuit(); }
 		}
 
 		[System.Serializable]
@@ -260,6 +268,13 @@ private void Awake()
 			}
 
 			PanelManager.Instance.RegisterCanvas( this );
+
+#if UNITY_2018_1_OR_NEWER
+			// OnApplicationQuit isn't reliable on some Unity versions when Application.wantsToQuit is used; Application.quitting is the only reliable solution on those versions
+			// https://issuetracker.unity3d.com/issues/onapplicationquit-method-is-called-before-application-dot-wantstoquit-event-is-raised
+			Application.quitting -= OnApplicationQuitting;
+			Application.quitting += OnApplicationQuitting;
+#endif
 		}
 
 		private void Start()
@@ -319,11 +334,19 @@ private void Start()
 
 		private void OnDestroy()
 		{
+#if UNITY_2018_1_OR_NEWER
+			Application.quitting -= OnApplicationQuitting;
+#endif
+
 			if( !isQuitting )
 				PanelManager.Instance.UnregisterCanvas( this );
 		}
 
+#if UNITY_2018_1_OR_NEWER
+		private void OnApplicationQuitting()
+#else
 		private void OnApplicationQuit()
+#endif
 		{
 			isQuitting = true;
 		}

Plugins/DynamicPanels/Scripts/Panel.cs

@@ -196,10 +196,18 @@ public void Stop()
 					panel.resizeZones[i].Stop();
 			}
 
+			public void OnApplicationQuit()
+			{
+#if UNITY_2018_1_OR_NEWER
+				panel.OnApplicationQuitting();
+#else
+				panel.OnApplicationQuit();
+#endif
+			}
+
 			public void AnchorZonesSetActive( bool value ) { panel.AnchorZonesSetActive( value ); }
 			public void OnResize( Direction direction, Vector2 screenPoint ) { panel.OnResize( direction, screenPoint ); }
 			public void OnTranslate( Vector2 deltaPosition ) { panel.OnTranslate( deltaPosition ); }
-			public void OnApplicationQuit() { panel.OnApplicationQuit(); }
 		}
 
 		public RectTransform RectTransform { get; private set; }
@@ -366,6 +374,13 @@ private void Awake()
 
 			closeButton.onClick.AddListener( () => PanelNotificationCenter.Internal.PanelClosed( this ) );
 			closeButton.transform.SetAsLastSibling();
+
+#if UNITY_2018_1_OR_NEWER
+			// OnApplicationQuit isn't reliable on some Unity versions when Application.wantsToQuit is used; Application.quitting is the only reliable solution on those versions
+			// https://issuetracker.unity3d.com/issues/onapplicationquit-method-is-called-before-application-dot-wantstoquit-event-is-raised
+			Application.quitting -= OnApplicationQuitting;
+			Application.quitting += OnApplicationQuitting;
+#endif
 		}
 
 		private void Start()
@@ -398,6 +413,10 @@ private void OnDisable()
 
 		private void OnDestroy()
 		{
+#if UNITY_2018_1_OR_NEWER
+			Application.quitting -= OnApplicationQuitting;
+#endif
+
 			if( !isQuitting )
 			{
 				PanelManager.Instance.UnregisterPanel( this );
@@ -407,7 +426,11 @@ private void OnDestroy()
 			}
 		}
 
+#if UNITY_2018_1_OR_NEWER
+		private void OnApplicationQuitting()
+#else
 		private void OnApplicationQuit()
+#endif
 		{
 			isQuitting = true;
 		}

Plugins/DynamicPanels/Scripts/PanelManager.cs

@@ -56,9 +56,27 @@ private void Awake()
 
 			nextPanelValidationTime = Time.realtimeSinceStartup + PANEL_TABS_VALIDATE_INTERVAL;
 			nullPointerEventData = new PointerEventData( null );
+
+#if UNITY_2018_1_OR_NEWER
+			// OnApplicationQuit isn't reliable on some Unity versions when Application.wantsToQuit is used; Application.quitting is the only reliable solution on those versions
+			// https://issuetracker.unity3d.com/issues/onapplicationquit-method-is-called-before-application-dot-wantstoquit-event-is-raised
+			Application.quitting -= OnApplicationQuitting;
+			Application.quitting += OnApplicationQuitting;
+#endif
+		}
+
+#if UNITY_2018_1_OR_NEWER
+		private void OnDestroy()
+		{
+			Application.quitting -= OnApplicationQuitting;
 		}
+#endif
 
+#if UNITY_2018_1_OR_NEWER
+		private void OnApplicationQuitting()
+#else
 		private void OnApplicationQuit()
+#endif
 		{
 			for( int i = 0; i < panels.Count; i++ )
 				panels[i].Internal.OnApplicationQuit();

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.dynamicpanels",
   "displayName": "Dynamic Panels",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "documentationUrl": "https://github.com/yasirkula/UnityDynamicPanels",
   "changelogUrl": "https://github.com/yasirkula/UnityDynamicPanels/releases",
   "licensesUrl": "https://github.com/yasirkula/UnityDynamicPanels/blob/master/LICENSE.txt",