mirror of
https://github.com/Ylianst/MeshAgent
synced 2026-01-05 18:13:38 +00:00
Merge branch 'master' of https://github.com/Ylianst/MeshAgent
This commit is contained in:
@@ -3226,7 +3226,7 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char **
|
|||||||
{
|
{
|
||||||
if (importSettings(agentHost, MeshAgent_MakeAbsolutePath(agentHost->exePath, ".msh")) == 0)
|
if (importSettings(agentHost, MeshAgent_MakeAbsolutePath(agentHost->exePath, ".msh")) == 0)
|
||||||
{
|
{
|
||||||
if (importSettings(agentHost, "mesh_linumshx") == 0) // Do this because the old agent would generate this bad file name on linux.
|
if ((importSettings(agentHost, "mesh_linumshx") == 0) && (importSettings(agentHost, "mesh_limshx") == 0)) // Do this because the old agent would generate this bad file name on linux.
|
||||||
{
|
{
|
||||||
// Let's check to see if an .msh was embedded into our binary
|
// Let's check to see if an .msh was embedded into our binary
|
||||||
checkForEmbeddedMSH(agentHost);
|
checkForEmbeddedMSH(agentHost);
|
||||||
|
|||||||
Reference in New Issue
Block a user