fix call to openvr, copy dll from submodule into build dir, copy dll …

…into bin dir
Ybalrid · May 11, 2021 · 99a75a6 · 99a75a6
1 parent 59fc76f
commit 99a75a6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/OpenXR-Runtime-Manager/OpenXR-Runtime-Manager/MainWindow.xaml.cs b/OpenXR-Runtime-Manager/OpenXR-Runtime-Manager/MainWindow.xaml.cs
@@ -27,12 +27,13 @@ public MainWindow()
 		{
 			InitializeComponent();
 			UpdateActiveRuntimeDisplay();
-			UpdateAvailalbeRuntimeList();
+			UpdateAvailableRuntimeList();
 		}
 
-		private void UpdateAvailalbeRuntimeList()
+		private void UpdateAvailableRuntimeList()
 		{
 			var availableRuntimeList = runtimeManager.AvailableRuntimeNames;
+			RuntimeList.Items.Clear();
 			foreach (string name in availableRuntimeList)
 			{
 				RuntimeList.Items.Add(name);

diff --git a/OpenXR-Runtime-Manager/OpenXR-Runtime-Manager/OpenXR-Runtime-Manager.csproj b/OpenXR-Runtime-Manager/OpenXR-Runtime-Manager/OpenXR-Runtime-Manager.csproj
@@ -164,11 +164,11 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy $(ProjectDir)openvr_api.dll $(TargetDir)</PostBuildEvent>
+    <PostBuildEvent>copy $(ProjectDir)openvr_api.dll $(TargetDir)openvr_api.dll</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>copy $(ProjectDir)..\..\third-party\openvr\bin\win64\openvr_api.dll ${ProjectDir)
-copy $(ProjectDir)..\..\third-party\openvr\headers\openvr_api.cs ${ProjectDir)
+    <PreBuildEvent>copy $(ProjectDir)..\..\third-party\openvr\bin\win64\openvr_api.dll $(ProjectDir)\openvr_api.dll
+copy $(ProjectDir)..\..\third-party\openvr\headers\openvr_api.cs $(ProjectDir)\openvr_api.cs
 </PreBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/OpenXR-Runtime-Manager/OpenXR-Runtime-Manager/RuntimeManager.cs b/OpenXR-Runtime-Manager/OpenXR-Runtime-Manager/RuntimeManager.cs
@@ -157,7 +157,7 @@ private static string GetKhronosOpenXRVersionRegistryKeyPath(int OpenXRVersion =
 		private bool ProbeForSteamVRInstallationPath()
 		{
 			StringBuilder pathBuilder = new StringBuilder(256);
-			uint bufferSize = (uint)pathBuilder.Length;
+			uint bufferSize = 256;
 			try
 			{
 				if (OpenVRInterop.GetRuntimePath(pathBuilder, bufferSize, ref bufferSize))