Fixed ShowScreen on Oculus.

RequiDev · RequiDev · commit 6c5c107c5093 · 2022-06-11T21:55:52.000+02:00
diff --git a/VRChat/VrcUiExtensions.cs b/VRChat/VrcUiExtensions.cs
@@ -103,9 +103,18 @@ public static void ShowUi(this VRCUiManager uiManager, bool showDefaultScreen =
             _showUi(uiManager, showDefaultScreen, showBackdrop);
         }
 
-        public static void ShowScreen(this VRCUiManager uiManager, string screen, bool addToScreenStack = false)
+        private delegate void ShowScreenDelegate(VRCUiManager uiManager, string screen, bool addToScreenStack);
+        private static ShowScreenDelegate _showScreen;
+
+        public static void ShowScreen(this VRCUiManager uiManager, string screen, bool addToScreenStack = true)
         {
-            uiManager.Method_Public_Void_String_Boolean_0(screen, addToScreenStack);
+            if (_showScreen == null)
+            {
+                _showScreen = (ShowScreenDelegate)Delegate.CreateDelegate(typeof(ShowScreenDelegate),
+                    typeof(VRCUiManager).GetMethods().First(m => m.Name.StartsWith("Method_Public_Void_String_Boolean") && XrefUtils.CheckUsedBy(m, nameof(VRCUiPageTab.ShowPage))));
+            }
+
+            _showScreen(uiManager, screen, addToScreenStack);
         }
 
         public static void ShowScreen(this VRCUiManager uiManager, QuickMenu.MainMenuScreenIndex menuIndex,

Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,18 @@ public static void ShowUi(this VRCUiManager uiManager, bool showDefaultScreen =`
`103`	`103`	`_showUi(uiManager, showDefaultScreen, showBackdrop);`
`104`	`104`	`}`
`105`	`105`
`106`		`- public static void ShowScreen(this VRCUiManager uiManager, string screen, bool addToScreenStack = false)`
	`106`	`+ private delegate void ShowScreenDelegate(VRCUiManager uiManager, string screen, bool addToScreenStack);`
	`107`	`+ private static ShowScreenDelegate _showScreen;`
	`108`	`+`
	`109`	`+ public static void ShowScreen(this VRCUiManager uiManager, string screen, bool addToScreenStack = true)`
`107`	`110`	`{`
`108`		`- uiManager.Method_Public_Void_String_Boolean_0(screen, addToScreenStack);`
	`111`	`+ if (_showScreen == null)`
	`112`	`+ {`
	`113`	`+ _showScreen = (ShowScreenDelegate)Delegate.CreateDelegate(typeof(ShowScreenDelegate),`
	`114`	`+ typeof(VRCUiManager).GetMethods().First(m => m.Name.StartsWith("Method_Public_Void_String_Boolean") && XrefUtils.CheckUsedBy(m, nameof(VRCUiPageTab.ShowPage))));`
	`115`	`+ }`
	`116`	`+`
	`117`	`+ _showScreen(uiManager, screen, addToScreenStack);`
`109`	`118`	`}`
`110`	`119`
`111`	`120`	`public static void ShowScreen(this VRCUiManager uiManager, QuickMenu.MainMenuScreenIndex menuIndex,`