diff --git a/CHANGELOG.md b/CHANGELOG.md index fc73534..cf6d01e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [3.2.7] - 2020-04-14 +* Fix issue where the wrong time value was being used to test for a timeout. + ## [3.2.6] - 2020-04-07 * Add log message to clarify the error when dealing with the un-bundled AR packages. diff --git a/Editor/Metadata/XRPackageMetadata.cs b/Editor/Metadata/XRPackageMetadata.cs index 1cf2d82..36b4f24 100644 --- a/Editor/Metadata/XRPackageMetadata.cs +++ b/Editor/Metadata/XRPackageMetadata.cs @@ -487,7 +487,7 @@ private static void MonitorPackageInstallation() QueueLoaderRequest(request); } } - else if (request.timeOut < Time.time) + else if (request.timeOut < Time.realtimeSinceStartup) { request.errorText = $"Error installing package {request.packageId}. Package installation timed out. Check Package Manager UI to see if the package is installed and/or retry your operation."; request.installationState = InstallationState.Error; @@ -560,7 +560,7 @@ private static void QueueLoaderRequest(LoaderAssignmentRequest req) case InstallationState.StartInstallation: req.needsAddRequest = true; req.packageAddRequest = null; - req.timeOut = Time.time + k_TimeOutDelta; + req.timeOut = Time.realtimeSinceStartup + k_TimeOutDelta; AddRequestToQueue(req, k_InstallingPackage); EditorApplication.update += MonitorPackageInstallation; break; diff --git a/package.json b/package.json index a8712b7..7c16b2f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.xr.management", "displayName": "XR Plugin Management", - "version": "3.2.6", + "version": "3.2.7", "unity": "2019.3", "unityRelease": "0f6", "description": "Package to provide for simple management of XR plug-ins. Provides help and management for loading, initialization, settings, and build support for XR plug-ins.", @@ -19,10 +19,10 @@ "com.unity.subsystemregistration": "1.0.6" }, "repository": { - "footprint": "cb1ef8b60e0571474e73c77e81c167fbffba2dd4", + "footprint": "66532a24eb9d07a26272b1a3302b031bb488032c", "type": "git", "url": "https://github.cds.internal.unity3d.com/unity/xr.sdk.management.git", - "revision": "c17913622a42461fc683261ea3e557add910fc4c" + "revision": "0b7726d38ab4161c3c877abfab98f162853fe64a" }, "samples": [ {