FIX: Fix input shutdown analytics event in editor (#803)

Author: jechter

Packages/com.unity.inputsystem/InputSystem/InputManager.cs

@@ -1663,7 +1663,6 @@ internal struct AvailableDevice
 
         #if UNITY_ANALYTICS || UNITY_EDITOR
         private bool m_HaveSentStartupAnalytics;
-        private bool m_HaveSentFirstUserInteractionAnalytics;
         #endif
 
         internal IInputRuntime m_Runtime;
@@ -2988,7 +2987,6 @@ internal struct SerializedState
 
             #if UNITY_ANALYTICS || UNITY_EDITOR
             public bool haveSentStartupAnalytics;
-            public bool haveSentFirstUserInteractionAnalytics;
             #endif
         }
 
@@ -3032,7 +3030,6 @@ internal SerializedState SaveState()
 
                 #if UNITY_ANALYTICS || UNITY_EDITOR
                 haveSentStartupAnalytics = m_HaveSentStartupAnalytics,
-                haveSentFirstUserInteractionAnalytics = m_HaveSentFirstUserInteractionAnalytics,
                 #endif
             };
         }
@@ -3051,7 +3048,6 @@ internal void RestoreStateWithoutDevices(SerializedState state)
 
             #if UNITY_ANALYTICS || UNITY_EDITOR
             m_HaveSentStartupAnalytics = state.haveSentStartupAnalytics;
-            m_HaveSentFirstUserInteractionAnalytics = state.haveSentFirstUserInteractionAnalytics;
             #endif
 
             ////REVIEW: instead of accessing globals here, we could move this to when we re-create devices

Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs

@@ -134,15 +134,15 @@ public Action onShutdown
                 if (value == null)
                 {
                     #if UNITY_EDITOR
-                    EditorApplication.quitting -= OnShutdown;
+                    EditorApplication.wantsToQuit -= OnWantsToShutdown;
                     #else
                     Application.quitting -= OnShutdown;
                     #endif
                 }
                 else if (m_ShutdownMethod == null)
                 {
                     #if UNITY_EDITOR
-                    EditorApplication.quitting += OnShutdown;
+                    EditorApplication.wantsToQuit += OnWantsToShutdown;
                     #else
                     Application.quitting += OnShutdown;
                     #endif
@@ -187,11 +187,30 @@ public float pollingFrequency
         private Action<InputUpdateType> m_OnBeforeUpdate;
         private Func<InputUpdateType, bool> m_OnShouldRunUpdate;
         private float m_PollingFrequency = 60.0f;
+        private bool m_DidCallOnShutdown = false;
         private void OnShutdown()
         {
             m_ShutdownMethod();
         }
 
+        private bool OnWantsToShutdown()
+        {
+            if (!m_DidCallOnShutdown)
+            {
+                // we should use `EditorApplication.quitting`, but that is too late
+                // to send an analytics event, because Analytics is already shut down
+                // at that point. So we use `EditorApplication.wantsToQuit`, and make sure
+                // to only use the first time. This is currently only used for analytics,
+                // and getting analytics before we actually shut downn in some cases is
+                // better then never.
+
+                OnShutdown();
+                m_DidCallOnShutdown = true;
+            }
+
+            return true;
+        }
+
         private Action<bool> m_FocusChangedMethod;
 
         private void OnFocusChanged(bool focus)