Skip to content

Commit 6c81438

Browse files
committed
Guard against potential null ref
1 parent 249c3bd commit 6c81438

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

Assets/MRTK/Core/Utilities/Editor/XRSettingsUtilities.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,16 @@ private static IReadOnlyList<XRLoader> XRSDKLoadersOfCurrentBuildTarget
202202
{
203203
BuildTargetGroup currentBuildTarget = BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget);
204204
XRGeneralSettings settingsOfCurrentTarget = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(currentBuildTarget);
205+
if (settingsOfCurrentTarget != null && settingsOfCurrentTarget.AssignedSettings != null)
206+
{
205207
#pragma warning disable CS0618 // Suppressing the warning to support xr management plugin 3.x and 4.x
206-
return settingsOfCurrentTarget.AssignedSettings.loaders;
208+
return settingsOfCurrentTarget.AssignedSettings.loaders;
207209
#pragma warning restore CS0618
210+
}
211+
else
212+
{
213+
return System.Array.Empty<XRLoader>();
214+
}
208215
}
209216
}
210217
#endif // XR_MANAGEMENT_ENABLED

0 commit comments

Comments
 (0)