Skip to content

Commit 3ff3b61

Browse files
authored
Merge pull request #102 from winnerspiros/copilot/fix-app-crash-on-startup
Defer AndroidNativeBridgeManager creation until native feature is actually enabled
2 parents ff042fd + bf4060d commit 3ff3b61

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)