Skip to content
This repository has been archived by the owner on Aug 11, 2024. It is now read-only.

Fix NRE on package asset import #695

Merged
merged 1 commit into from
Nov 24, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions XRTK-Core/Packages/com.xrtk.core/Editor/PackageInstaller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -139,20 +139,33 @@ private static void AddConfigurations(List<string> profiles)

if (platformConfigurationProfile.IsNull()) { continue; }

var rootProfile = MixedRealityToolkit.IsInitialized
? MixedRealityToolkit.Instance.ActiveProfile
: ScriptableObjectExtensions.GetAllInstances<MixedRealityToolkitRootProfile>()[0];

if (EditorUtility.DisplayDialog("We found a new Platform Configuration",
$"We found the {platformConfigurationProfile.name.ToProperCase()}. Would you like to add this platform configuration to your {rootProfile.name}?",
"Yes, Absolutely!",
"later"))
MixedRealityToolkitRootProfile rootProfile;
if (MixedRealityToolkit.IsInitialized)
{
InstallConfiguration(platformConfigurationProfile, rootProfile);
rootProfile = MixedRealityToolkit.Instance.ActiveProfile;
}
else
{
EditorUtility.DisplayDialog("Attention!", "Each data provider will need to be manually registered in each service configuration.", "OK");
var availableRootProfiles = ScriptableObjectExtensions.GetAllInstances<MixedRealityToolkitRootProfile>();
rootProfile = availableRootProfiles.Length > 0 ? availableRootProfiles[0] : null;
}

// Only if a root profile is available at all it makes sense to display the
// platform configuration import dialog. If the user does not have a root profile yet,
// for whatever reason, there is nothing we can do here.
if (rootProfile.IsNull())
{
if (EditorUtility.DisplayDialog("We found a new Platform Configuration",
$"We found the {platformConfigurationProfile.name.ToProperCase()}. Would you like to add this platform configuration to your {rootProfile.name}?",
"Yes, Absolutely!",
"later"))
{
InstallConfiguration(platformConfigurationProfile, rootProfile);
}
else
{
EditorUtility.DisplayDialog("Attention!", "Each data provider will need to be manually registered in each service configuration.", "OK");
}
}
}
}
Expand Down