Skip to content

Commit bf4060d

Browse files
Copilotwinnerspiros
andcommitted
Fix Android startup crash: defer native bridge type loading until actually needed
Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/028519f5-69d1-4bb3-92d3-b2ddfaa1b87b Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
1 parent aaef4f2 commit bf4060d

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

osu.Android/OsuGameAndroid.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,9 @@ protected override void LoadComplete()
120120
{
121121
try
122122
{
123-
nativeBridges ??= new AndroidNativeBridgeManager();
124-
125123
if (e.NewValue)
126124
{
125+
nativeBridges ??= new AndroidNativeBridgeManager();
127126
nativeBridges.StartOboeBridge(Scheduler, latency =>
128127
{
129128
// Only auto-suggest when the user hasn't already configured a manual offset.
@@ -137,7 +136,7 @@ protected override void LoadComplete()
137136
}
138137
else
139138
{
140-
nativeBridges.StopOboeBridge();
139+
nativeBridges?.StopOboeBridge();
141140
}
142141
}
143142
catch (Exception ex)
@@ -150,12 +149,15 @@ protected override void LoadComplete()
150149
{
151150
try
152151
{
153-
nativeBridges ??= new AndroidNativeBridgeManager();
154-
155152
if (e.NewValue)
153+
{
154+
nativeBridges ??= new AndroidNativeBridgeManager();
156155
nativeBridges.StartVulkanProbe();
156+
}
157157
else
158-
nativeBridges.StopVulkanProbe();
158+
{
159+
nativeBridges?.StopVulkanProbe();
160+
}
159161
}
160162
catch (Exception ex)
161163
{

0 commit comments

Comments
 (0)