Resolve conflicts

This commit is contained in:
Jack251970 2025-10-02 20:25:45 +08:00
parent 6213193cda
commit 5ed94c8abc
2 changed files with 4 additions and 7 deletions

View file

@ -184,7 +184,7 @@ namespace Flow.Launcher.Core.Plugin
}
catch (Exception e)
{
API.LogDebug(ClassName, $"Failed to delete {binding} in {subDirectory}: {e.Message}");
PublicApi.Instance.LogDebug(ClassName, $"Failed to delete {binding} in {subDirectory}: {e.Message}");
}
}
}
@ -300,11 +300,8 @@ namespace Flow.Launcher.Core.Plugin
{
var failed = string.Join(",", _initFailedPlugins.Values.Select(x => x.Metadata.Name));
PublicApi.Instance.ShowMsg(
PublicApi.Instance.GetTranslation("failedToInitializePluginsTitle"),
string.Format(
API.GetTranslation("failedToInitializePluginsMessage"),
failed
),
Localize.failedToInitializePluginsTitle(),
Localize.failedToInitializePluginsMessage(failed),
"",
false
);

View file

@ -389,7 +389,7 @@ namespace Flow.Launcher.Core.Resource
}
catch (Exception e)
{
API.LogException(ClassName, $"Failed for <{p.Metadata.Name}>", e);
PublicApi.Instance.LogException(ClassName, $"Failed for <{p.Metadata.Name}>", e);
}
}