From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Wed, 3 Aug 2016 11:32:51 +0000 (+0900)
Subject: 装備一覧の表示中にドロップ艦のいる出撃から戻るとエラーになるのを直す
X-Git-Tag: v8.15~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;ds=sidebyside;h=7f1b922399d48c16d680dbba46dfe70834afecf2;p=kancollesniffer%2FKancolleSniffer.git

装備一覧の表示中にドロップ艦のいる出撃から戻るとエラーになるのを直す
---

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index faaf9ba..708d216 100644
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -604,6 +604,17 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// ドロップ艦のいる出撃から戻ったときに、slot_itemを受信する前にItemListを取得しても例外を出さない
+        /// </summary>
+        [TestMethod]
+        public void GetItemListBeforeReceivingSlotItem()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "dropship_001");
+            PAssert.That(() => sniffer.ItemList[0].Ship.Id == 250);
+        }
+
+        /// <summary>
         /// 資材の変動を正しく反映する
         /// </summary>
         [TestMethod]
diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 57c0fb0..985489c 160000
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 57c0fb0663cb2c5d83f39f16c4487c9929572ef3
+Subproject commit 985489c9e447c2cc47f5d055cb0caf7b24839bfa
diff --git a/KancolleSniffer/ItemInfo.cs b/KancolleSniffer/ItemInfo.cs
index c8c1828..39ff612 100644
--- a/KancolleSniffer/ItemInfo.cs
+++ b/KancolleSniffer/ItemInfo.cs
@@ -566,9 +566,9 @@ namespace KancolleSniffer
                 e.Value.Ship = new ShipStatus();
             foreach (var s in shipList)
             {
-                foreach (var id in s.Slot)
-                    _itemInfo[id.Id].Ship = s;
-                _itemInfo[s.SlotEx.Id].Ship = s;
+                foreach (var item in s.Slot)
+                    item.Ship = s;
+                s.SlotEx.Ship = s;
             }
             return (from e in _itemInfo where e.Key != -1 select e.Value).ToArray();
         }