Version 1.2.1

Author: aaronleiby

Assets/SteamVR/Editor/SteamVR_Settings.cs

@@ -108,49 +108,53 @@ static void Update()
 			//window.title = "SteamVR";
 		}
 
-		// Switch to native OpenVR support.
-		var updated = false;
-
-		if (!PlayerSettings.virtualRealitySupported)
+		if (SteamVR_Preferences.AutoEnableVR)
 		{
-			PlayerSettings.virtualRealitySupported = true;
-			updated = true;
-		}
+			// Switch to native OpenVR support.
+			var updated = false;
+
+			if (!PlayerSettings.virtualRealitySupported)
+			{
+				PlayerSettings.virtualRealitySupported = true;
+				updated = true;
+			}
 
 #if (UNITY_5_4 || UNITY_5_3 || UNITY_5_2 || UNITY_5_1 || UNITY_5_0)
-		var devices = UnityEditorInternal.VR.VREditor.GetVREnabledDevices(BuildTargetGroup.Standalone);
+			var devices = UnityEditorInternal.VR.VREditor.GetVREnabledDevices(BuildTargetGroup.Standalone);
 #else
-		var devices = UnityEditorInternal.VR.VREditor.GetVREnabledDevicesOnTargetGroup(BuildTargetGroup.Standalone);
+			var devices = UnityEditorInternal.VR.VREditor.GetVREnabledDevicesOnTargetGroup(BuildTargetGroup.Standalone);
 #endif
-		var hasOpenVR = false;
-		foreach (var device in devices)
-			if (device.ToLower() == "openvr")
-				hasOpenVR = true;
+			var hasOpenVR = false;
+			foreach (var device in devices)
+				if (device.ToLower() == "openvr")
+					hasOpenVR = true;
 
-		if (!hasOpenVR)
-		{
-			string[] newDevices;
-			if (updated)
-			{
-				newDevices = new string[] { "OpenVR" };
-			}
-			else
+
+			if (!hasOpenVR)
 			{
-				newDevices = new string[devices.Length + 1];
-				for (int i = 0; i < devices.Length; i++)
-					newDevices[i] = devices[i];
-				newDevices[devices.Length] = "OpenVR";
-				updated = true;
-			}
+				string[] newDevices;
+				if (updated)
+				{
+					newDevices = new string[] { "OpenVR" };
+				}
+				else
+				{
+					newDevices = new string[devices.Length + 1];
+					for (int i = 0; i < devices.Length; i++)
+						newDevices[i] = devices[i];
+					newDevices[devices.Length] = "OpenVR";
+					updated = true;
+				}
 #if (UNITY_5_4 || UNITY_5_3 || UNITY_5_2 || UNITY_5_1 || UNITY_5_0)
-			UnityEditorInternal.VR.VREditor.SetVREnabledDevices(BuildTargetGroup.Standalone, newDevices);
+				UnityEditorInternal.VR.VREditor.SetVREnabledDevices(BuildTargetGroup.Standalone, newDevices);
 #else
-			UnityEditorInternal.VR.VREditor.SetVREnabledDevicesOnTargetGroup(BuildTargetGroup.Standalone, newDevices);
+				UnityEditorInternal.VR.VREditor.SetVREnabledDevicesOnTargetGroup(BuildTargetGroup.Standalone, newDevices);
 #endif
-		}
+			}
 
-		if (updated)
-			Debug.Log("Switching to native OpenVR support.");
+			if (updated)
+				Debug.Log("Switching to native OpenVR support.");
+		}
 
 		var dlls = new string[]
 		{
@@ -175,8 +179,7 @@ static void Update()
 	}
 
 	Vector2 scrollPosition;
-	bool toggleState;
-
+	
 	string GetResourcePath()
 	{
 		var ms = MonoScript.FromScriptableObject(this);

Assets/SteamVR/Editor/SteamVR_Update.cs

@@ -12,33 +12,37 @@
 [InitializeOnLoad]
 public class SteamVR_Update : EditorWindow
 {
-	const string currentVersion = "1.2.0";
+	const string currentVersion = "1.2.1";
 	const string versionUrl = "http://media.steampowered.com/apps/steamvr/unitypluginversion.txt";
 	const string notesUrl = "http://media.steampowered.com/apps/steamvr/unityplugin-v{0}.txt";
 	const string pluginUrl = "http://u3d.as/content/valve-corporation/steam-vr-plugin";
 	const string doNotShowKey = "SteamVR.DoNotShow.v{0}";
 
+	static bool gotVersion = false;
 	static WWW wwwVersion, wwwNotes;
 	static string version, notes;
 	static SteamVR_Update window;
 
 	static SteamVR_Update()
 	{
-		wwwVersion = new WWW(versionUrl);
 		EditorApplication.update += Update;
 	}
 
 	static void Update()
 	{
-		if (wwwVersion != null)
+		if (!gotVersion)
 		{
+			if (wwwVersion == null)
+				wwwVersion = new WWW(versionUrl);
+
 			if (!wwwVersion.isDone)
 				return;
 
 			if (UrlSuccess(wwwVersion))
 				version = wwwVersion.text;
 
 			wwwVersion = null;
+			gotVersion = true;
 
 			if (ShouldDisplay())
 			{