(d9829ac) v0.9.4.0

2019-10-24 18:05:42 +02:00
parent 9aa12bcac2
commit b39922a074
319 changed files with 12516 additions and 6815 deletions
@@ -209,7 +209,14 @@ namespace Barotrauma

        public static SlotReference SelectedSlot
        {
-            get { return selectedSlot; }
+            get
+            {
+                if (selectedSlot?.ParentInventory?.Owner == null || selectedSlot.ParentInventory.Owner.Removed)
+                {
+                    return null;
+                }
+                return selectedSlot;
+            }
        }

        public virtual void CreateSlots()
@@ -430,6 +437,8 @@ namespace Barotrauma

            if (canMove)
            {
+                subInventory.HideTimer = 1.0f;
+                subInventory.OpenState = 1.0f;
                if (subInventory.movableFrameRect.Contains(PlayerInput.MousePosition) && PlayerInput.RightButtonClicked())
                {
                    container.Inventory.savedPosition = container.Inventory.originalPos;