FIX: Fixed a bug where the Input Settings Window might throw exceptio… (#885)

Author: jechter

Assets/Tests/InputSystem/CoreTests_Editor.cs

@@ -39,8 +39,8 @@ public void Editor_PackageVersionAndAssemblyVersionAreTheSame()
 
         // Snip -preview off the end. System.Version doesn't support semantic versioning.
         var versionString = packageJson.version;
-        if (versionString.EndsWith("-preview"))
-            versionString = versionString.Substring(0, versionString.Length - "-preview".Length);
+        if (versionString.Contains("-preview"))
+            versionString = versionString.Substring(0, versionString.IndexOf("-preview"));
         var version = new Version(versionString);
 
         Assert.That(InputSystem.version.Major, Is.EqualTo(version.Major));

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 Due to package verification, the latest version below is the unpublished version and the date is meaningless.
 however, it has to be formatted properly to pass verification tests.
 
+## [1.0.0-preview.1] - 2999-9-20
+
+### Fixed
+
+- Fixed a bug where the Input Settings Window might throw exceptions after assembly reload.
+
 ## [1.0.0-preview] - 2019-9-20
 
 ### Fixed

Packages/com.unity.inputsystem/InputSystem/Editor/Settings/InputSettingsProvider.cs

@@ -5,6 +5,7 @@
 using UnityEditor;
 using UnityEditorInternal;
 using UnityEngine.InputSystem.Utilities;
+using UnityEngine.UIElements;
 
 ////TODO: detect if new input backends are enabled and put UI in here to enable them if needed
 
@@ -33,10 +34,20 @@ private InputSettingsProvider(string path, SettingsScope scopes)
         {
             label = "Input System Package";
             s_Instance = this;
+        }
 
+        public override void OnActivate(string searchContext, VisualElement rootElement)
+        {
+            base.OnActivate(searchContext, rootElement);
             InputSystem.onSettingsChange += OnSettingsChange;
         }
 
+        public override void OnDeactivate()
+        {
+            base.OnDeactivate();
+            InputSystem.onSettingsChange -= OnSettingsChange;
+        }
+
         public void Dispose()
         {
             m_SettingsObject?.Dispose();

Packages/com.unity.inputsystem/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "com.unity.inputsystem",
 	"displayName": "Input System",
-	"version": "1.0.0-preview",
+	"version": "1.0.0-preview.1",
 	"unity": "2019.1",
 	"repository": {
 		"type": "git",