From e5698c4c0c020550b9d44474a950bc73379518ee Mon Sep 17 00:00:00 2001
From: Stanley Dimant <stanley.dimant@varian.com>
Date: Fri, 17 Mar 2023 13:57:09 +0100
Subject: [PATCH] fix current server

---
 MareSynchronos/MareConfiguration/ConfigurationMigrator.cs   | 2 ++
 MareSynchronos/MareSynchronos.csproj                        | 2 +-
 .../ServerConfiguration/ServerConfigurationManager.cs       | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs b/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs
index e70744c..2e9dff1 100644
--- a/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs
+++ b/MareSynchronos/MareConfiguration/ConfigurationMigrator.cs
@@ -138,6 +138,8 @@ public class ConfigurationMigrator : IHostedService
         var currentServer = serverConfigV0.CurrentServer;
         var currentServerIdx = Array.IndexOf(serverConfigV0.ServerStorage.Keys.ToArray(), currentServer);
 
+        if (currentServerIdx == -1) currentServerIdx = 0;
+
         migrated.CurrentServer = currentServerIdx;
         migrated.ServerStorage = new();
 
diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index bf86660..05be691 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>0.8.7</Version>
+    <Version>0.8.8</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>
diff --git a/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs b/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs
index e34f91f..192d269 100644
--- a/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs
+++ b/MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs
@@ -23,6 +23,12 @@ public class ServerConfigurationManager
         _serverTagConfig = serverTagConfig;
         _notesConfig = notesConfig;
         _dalamudUtil = dalamudUtil;
+
+        if (_configService.Current.CurrentServer < 0)
+        {
+            _configService.Current.CurrentServer = 0;
+            _configService.Save();
+        }
     }
 
     public string CurrentApiUrl => CurrentServer.ServerUri;