Browse Source

Null check gravity controls on unload

habeebweeb 4 years ago
parent
commit
43d6d83ce5
1 changed files with 10 additions and 4 deletions
  1. 10 4
      COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/Meido.cs

+ 10 - 4
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Meido/Meido.cs

@@ -236,11 +236,17 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
                 Body.quaDefEyeL = DefaultEyeRotL;
                 Body.quaDefEyeR = DefaultEyeRotR;
 
-                HairGravityActive = false;
-                SkirtGravityActive = false;
+                if (HairGravityControl)
+                {
+                    HairGravityControl.Move -= OnGravityEvent;
+                    HairGravityActive = false;
+                }
 
-                SkirtGravityControl.Move -= OnGravityEvent;
-                HairGravityControl.Move -= OnGravityEvent;
+                if (SkirtGravityControl)
+                {
+                    SkirtGravityControl.Move -= OnGravityEvent;
+                    SkirtGravityActive = false;
+                }
 
                 ApplyGravity(Vector3.zero, skirt: false);
                 ApplyGravity(Vector3.zero, skirt: true);