Browse Source

Fix MeidoManager interrupting deactivation

MeidoManager tries to set the edit maid when leaving to the title screen
but it can't do it properly so it throws an error and stops
deactivation for everything else.

Since the edit mode state is reset anyway, cleaning up when returning to
the title screen is unnecessary.
habeebweeb 4 years ago
parent
commit
4f7305d8a9

+ 1 - 1
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Managers/MeidoManager.cs

@@ -107,7 +107,7 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
 
             ActiveMeidoList.Clear();
 
-            if (MeidoPhotoStudio.EditMode)
+            if (MeidoPhotoStudio.EditMode && !GameMain.Instance.MainCamera.IsFadeOut())
             {
                 Meido meido = Meidos[EditMaidIndex];
                 meido.Maid.Visible = true;