Merge pull request #970 from erdelf/master

adjusted setting of profile defaults and initialization

Author: erdelf

AutoDuty/AutoDuty.cs

@@ -228,7 +228,7 @@ public AutoDuty()
             AssemblyDirectoryInfo = AssemblyFileInfo.Directory;
 
             Version = 
-                ((PluginInterface.IsDev     ? new Version(0,0,0, 214) :
+                ((PluginInterface.IsDev     ? new Version(0,0,0, 215) :
                   PluginInterface.IsTesting ? PluginInterface.Manifest.TestingAssemblyVersion ?? PluginInterface.Manifest.AssemblyVersion : PluginInterface.Manifest.AssemblyVersion)!).Revision;
 
             if (!_configDirectory.Exists)
@@ -261,12 +261,9 @@ public AutoDuty()
             WindowSystem.AddWindow(MainWindow);
             WindowSystem.AddWindow(Overlay);
 
-            if (Configuration.ShowOverlay && (!Configuration.HideOverlayWhenStopped || States.HasFlag(PluginState.Looping) || States.HasFlag(PluginState.Navigating)))
-                SchedulerHelper.ScheduleAction("ShowOverlay", () => Overlay.IsOpen = true, () => PlayerHelper.IsReady);
-
-            if (Configuration.ShowMainWindowOnStartup)
-                SchedulerHelper.ScheduleAction("ShowMainWindowOnStartup", () => OpenMainUI(), () => PlayerHelper.IsReady);
-
+            if (Svc.ClientState.IsLoggedIn) 
+                this.ClientStateOnLogin();
+             
             Svc.Commands.AddHandler("/ad", new CommandInfo(OnCommand) { });
             Svc.Commands.AddHandler(CommandName, new CommandInfo(OnCommand)
             {
@@ -317,9 +314,20 @@ public AutoDuty()
         }
     }
 
-    private static void ClientStateOnLogin() => 
+    private void ClientStateOnLogin()
+    {
         ConfigurationMain.Instance.SetProfileToDefault();
 
+        Svc.Framework.RunOnTick(() =>
+                                {
+                                    if (Configuration.ShowOverlay && (!Configuration.HideOverlayWhenStopped || States.HasFlag(PluginState.Looping) || States.HasFlag(PluginState.Navigating)))
+                                        SchedulerHelper.ScheduleAction("ShowOverlay", () => Overlay.IsOpen = true, () => PlayerHelper.IsReady);
+
+                                    if (Configuration.ShowMainWindowOnStartup)
+                                        SchedulerHelper.ScheduleAction("ShowMainWindowOnStartup", () => OpenMainUI(), () => PlayerHelper.IsReady);
+                                });
+    }
+
     private void UiBuilderOnDraw()
     {
         if (PlayerHelper.IsValid)

AutoDuty/Windows/Config.cs

@@ -155,11 +155,12 @@ public void SetProfileAsDefault()
 
     public void SetProfileToDefault()
     {
+        this.SetProfile(CONFIGNAME_BARE);
         Svc.Framework.RunOnTick(() =>
         {
-            DebugLog("Setting to default profile");
+            DebugLog($"Setting to default profile for {Player.Name} ({Player.CID}) {PlayerHelper.IsValid}");
 
-            if (PlayerHelper.IsValid && this.profileByCID.TryGetValue(Player.CID, out string? charProfile))
+            if (Player.Available && this.profileByCID.TryGetValue(Player.CID, out string? charProfile))
                 if (this.SetProfile(charProfile))
                     return;
             DebugLog("No char default found. Using general default");
@@ -215,6 +216,7 @@ public void DuplicateCurrentProfile()
 
     public void RemoveCurrentProfile()
     {
+        DebugLog("Removing " + this.ActiveProfileName);
         this.profileData.Remove(this.GetCurrentProfile);
         this.profileByName.Remove(this.ActiveProfileName);
         this.SetProfileToDefault();