Merge pull request #31845 from frenzibyte/ios-threading-woes

peppy · web-flow · commit 6ff1a13b673c · 2025-02-10T20:45:19.000+09:00
Fix incorrect thread access in recent iOS orientation changes
diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs
@@ -41,7 +41,7 @@ protected override void ScreenChanged(IOsuScreen? current, IOsuScreen? newScreen
                 updateOrientation();
         }
 
-        private void updateOrientation()
+        private void updateOrientation() => UIApplication.SharedApplication.InvokeOnMainThread(() =>
         {
             bool iPad = UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.Pad;
             var orientation = MobileUtils.GetOrientation(this, (IOsuScreen)ScreenStack.CurrentScreen, iPad);
@@ -60,7 +60,7 @@ private void updateOrientation()
                     appDelegate.Orientations = null;
                     break;
             }
-        }
+        });
 
         protected override UpdateManager CreateUpdateManager() => new MobileUpdateNotifier();
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ protected override void ScreenChanged(IOsuScreen? current, IOsuScreen? newScreen`
`41`	`41`	`updateOrientation();`
`42`	`42`	`}`
`43`	`43`
`44`		`- private void updateOrientation()`
	`44`	`+ private void updateOrientation() => UIApplication.SharedApplication.InvokeOnMainThread(() =>`
`45`	`45`	`{`
`46`	`46`	`bool iPad = UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.Pad;`
`47`	`47`	`var orientation = MobileUtils.GetOrientation(this, (IOsuScreen)ScreenStack.CurrentScreen, iPad);`
`@@ -60,7 +60,7 @@ private void updateOrientation()`
`60`	`60`	`appDelegate.Orientations = null;`
`61`	`61`	`break;`
`62`	`62`	`}`
`63`		`- }`
	`63`	`+ });`
`64`	`64`
`65`	`65`	`protected override UpdateManager CreateUpdateManager() => new MobileUpdateNotifier();`
`66`	`66`