保有アイテムがないときに海戦から戻るとエラーになるのを直す

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index acc2361..5e0ee29 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -81,10 +81,10 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
-        /// 一つもアイテムがない場合\r
+        /// 一つもアイテムがない場合のrequire_info\r
         /// </summary>\r
         [TestMethod]\r
-        public void NoUseItem()\r
+        public void NoUseItemRequireInfo()\r
         {\r
             var sniffer = new Sniffer(true);\r
             SniffLogFile(sniffer, "require_info_001");\r
@@ -92,6 +92,17 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 一つもアイテムがない場合のuseitem\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void NoUseItem()\r
+        {\r
+            var sniffer = new Sniffer(true);\r
+            SniffLogFile(sniffer, "useitem_001");\r
+            Assert.IsTrue(true);\r
+        }\r
+\r
+        /// <summary>\r
         /// 熟練度込みの制空値を正しく計算する\r
         /// </summary>\r
         [TestMethod]\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 9e01c63..8f2f46e 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 9e01c6342764ef7c8ac73f79198e0edcf0057fc6
+Subproject commit 8f2f46eb61f8229e4d14d2bf939e3e6c9152a947

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 1d799f9..22f3cd1 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -252,6 +252,8 @@ namespace KancolleSniffer
             }\r
             if (url.EndsWith("api_get_member/useitem"))\r
             {\r
+                if (data == null)\r
+                    return Update.None;\r
                 _itemInfo.InspectUseItem(data);\r
                 return Update.Item;\r
             }\r