fix: unexpected null pointers

Author: dbirman

Assets/Scripts/Pinpoint/TrajectoryPlannerManager.cs

@@ -153,7 +153,6 @@ public async void Startup()
         {
             // Clear the "Reset" PlayerPrefs flag
             _sceneWasReset = PlayerPrefs.GetInt(SCENE_RESET_KEY, 0) == 1;
-            PlayerPrefs.SetInt(SCENE_RESET_KEY, 0);
 
             // STARTUP SEQUENCE
             StartupEvent_MetaLoaded.Invoke();
@@ -208,6 +207,7 @@ public async void Startup()
             ProbeManager.ActiveProbeUIUpdateEvent.AddListener(() => SetSurfaceDebugColor(ProbeManager.ActiveProbeManager.Color));
 
             // Complete
+            PlayerPrefs.SetInt(SCENE_RESET_KEY, 0);
             StartupEvent_Complete.Invoke();
 
             // After annotation loads, check if the user wants to load previously used probes

Assets/Scripts/Pinpoint/Utilities/Settings.cs

@@ -706,8 +706,11 @@ private void Apply()
 
         // Atlas
         AtlasName = data.AtlasName;
+        if (PlayerPrefs.GetInt("scene-rest", 0) == 0)
+            AtlasTransformName = data.AtlasTransformName;
+        else
+            AtlasTransformName = INVIVO_DEFAULT;
         // the relative coordinate actually needs to be set, since it gets propagated downstream
-        AtlasTransformName = data.AtlasTransformName;
         ReferenceCoord = data.RelativeCoord;
         _blSlider.SetValueWithoutNotify(BregmaLambdaDistance);
 

Packages/packages-lock.json

@@ -223,7 +223,7 @@
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "d4b826927f73db079701bd929007421b40573d1b"
+      "hash": "8f1d5e978814b53f242ddd32e18c9f6dfc29cc23"
     },
     "vbl.urchin": {
       "version": "https://github.com/VirtualBrainLab/Urchin.git?path=/UnityClient/Packages/vbl.urchin",