lozy360/CustomizeTool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Improved handling of empty preview character setting

Browse Source
This commit is contained in:
RisaDev
2024-04-13 22:47:00 +03:00
parent 051c344a81
commit 76729b04f7
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CustomizePlus/Templates/TemplateEditorManager.cs
View File

@@ -9,6 +9,7 @@ using CustomizePlus.Templates.Data;
using CustomizePlus.Templates.Events; using CustomizePlus.Templates.Events;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene; using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using OtterGui.Classes;
using OtterGui.Log; using OtterGui.Log;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -94,7 +95,7 @@ public class TemplateEditorManager : IDisposable
Enabled = false, Enabled = false,
Name = "Template editor profile", Name = "Template editor profile",
ProfileType = ProfileType.Editor, ProfileType = ProfileType.Editor,
CharacterName = configuration.EditorConfiguration.PreviewCharacterName! CharacterName = configuration.EditorConfiguration.PreviewCharacterName ?? LowerString.Empty
}; };
} }
@@ -123,10 +124,8 @@ public class TemplateEditorManager : IDisposable
Name = "Template editor temporary template" Name = "Template editor temporary template"
}; };
if (CharacterName == null) //safeguard if (string.IsNullOrWhiteSpace(CharacterName)) //safeguard
ChangeEditorCharacterInternal(_gameObjectService.GetCurrentPlayerName()); //will also set EditorProfile.CharacterName ChangeEditorCharacterInternal(_gameObjectService.GetCurrentPlayerName()); //will set EditorProfile.CharacterName
else
EditorProfile.CharacterName = CharacterName;
EditorProfile.Templates.Clear(); //safeguard EditorProfile.Templates.Clear(); //safeguard
EditorProfile.Templates.Add(CurrentlyEditedTemplate); EditorProfile.Templates.Add(CurrentlyEditedTemplate);
@@ -175,7 +174,7 @@ public class TemplateEditorManager : IDisposable
public bool ChangeEditorCharacter(string characterName) public bool ChangeEditorCharacter(string characterName)
{ {
if (!IsEditorActive || CharacterName == characterName || IsEditorPaused) if (!IsEditorActive || CharacterName == characterName || IsEditorPaused || string.IsNullOrWhiteSpace(characterName))
return false; return false;
return ChangeEditorCharacterInternal(characterName); return ChangeEditorCharacterInternal(characterName);
@@ -310,6 +309,11 @@ public class TemplateEditorManager : IDisposable
string.IsNullOrWhiteSpace(_configuration.EditorConfiguration.PreviewCharacterName)) string.IsNullOrWhiteSpace(_configuration.EditorConfiguration.PreviewCharacterName))
{ {
var localPlayerName = _gameObjectService.GetCurrentPlayerName(); var localPlayerName = _gameObjectService.GetCurrentPlayerName();
if(string.IsNullOrWhiteSpace(localPlayerName))
{
_logger.Warning("Can't retrieve local player name on login");
return;
}
if (_configuration.EditorConfiguration.PreviewCharacterName != localPlayerName) if (_configuration.EditorConfiguration.PreviewCharacterName != localPlayerName)
{ {