Skip to content

Commit

Permalink
Delay CopyExampleInputFiles from DidReloadScripts to editor update
Browse files Browse the repository at this point in the history
As Resource.Load fails and returns null during asset import SteamVR_Settings.instance cannot be called from DidReloadScripts

Fixes ValveSoftware#949
  • Loading branch information
Peaj committed Jul 23, 2021
1 parent 9442d7d commit 486901e
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions Assets/SteamVR/Input/Editor/SteamVR_CopyExampleInputFiles.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ public class SteamVR_CopyExampleInputFiles : Editor
[UnityEditor.Callbacks.DidReloadScripts]
private static void OnReloadScripts()
{
//Delay method calls as SteamVR_Settings.instance cannot be accessed from 'DidReloadScripts'
EditorApplication.update += Update;
}

private static void Update()
{
EditorApplication.update -= Update;
SteamVR_Input.CheckOldLocation();
CopyFiles();
}
Expand Down

0 comments on commit 486901e

Please sign in to comment.