設定ファイルのパスの相対化に失敗することがあるのを直す

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / Config.cs

diff --git a/KancolleSniffer/Config.cs b/KancolleSniffer/Config.cs
index 1262a78..6636163 100644 (file)
--- a/KancolleSniffer/Config.cs
+++ b/KancolleSniffer/Config.cs
@@ -70,12 +70,6 @@ namespace KancolleSniffer
         }\r
     }\r
 \r
-    public class KancolleDbConfig\r
-    {\r
-        public bool On { get; set; }\r
-        public string Token { get; set; } = "";\r
-    }\r
-\r
     public class PushbulletConfig\r
     {\r
         public bool On { get; set; }\r
@@ -193,7 +187,7 @@ namespace KancolleSniffer
 \r
     public class Config\r
     {\r
-        private readonly string _baseDir = AppDomain.CurrentDomain.BaseDirectory;\r
+        private readonly string _baseDir = AppDomain.CurrentDomain.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar);\r
         private readonly string _configFileName;\r
 \r
         public Point Location { get; set; } = new Point(int.MinValue, int.MinValue);\r
@@ -223,7 +217,6 @@ namespace KancolleSniffer
         public ProxyConfig Proxy { get; set; } = new ProxyConfig();\r
         public ShipListConfig ShipList { get; set; } = new ShipListConfig();\r
         public LogConfig Log { get; set; } = new LogConfig();\r
-        public KancolleDbConfig KancolleDb { get; set; } = new KancolleDbConfig();\r
         public PushbulletConfig Pushbullet { get; set; } = new PushbulletConfig();\r
         public PushoverConfig Pushover { get; set; } = new PushoverConfig();\r
 \r
@@ -344,7 +337,7 @@ namespace KancolleSniffer
             if (!path.StartsWith(_baseDir))\r
                 return path;\r
             path = path.Substring(_baseDir.Length);\r
-            return path.StartsWith(Path.DirectorySeparatorChar.ToString()) ? path.Substring(1) : path;\r
+            return path.TrimStart(Path.DirectorySeparatorChar);\r
         }\r
 \r
         private string PrependBaseDir(string path) => Path.IsPathRooted(path) ? path : Path.Combine(_baseDir, path);\r