From 989a500b6e9b49057dbe7358ecf11a3e4ef206bf Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Fri, 11 Jan 2019 16:18:09 -0800 Subject: [PATCH] Fix from Ylian, regarding Linux Transition Agent --- meshcore/agentcore.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meshcore/agentcore.c b/meshcore/agentcore.c index d867ae7..e05ad07 100644 --- a/meshcore/agentcore.c +++ b/meshcore/agentcore.c @@ -3175,9 +3175,12 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char ** { if (importSettings(agentHost, MeshAgent_MakeAbsolutePath(agentHost->exePath, ".msh")) == 0) { - // Let's check to see if an .msh was embedded into our binary - checkForEmbeddedMSH(agentHost); - importSettings(agentHost, MeshAgent_MakeAbsolutePath(agentHost->exePath, ".msh")); + if (importSettings(agentHost, "mesh_linumshx") == 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 + checkForEmbeddedMSH(agentHost); + importSettings(agentHost, MeshAgent_MakeAbsolutePath(agentHost->exePath, ".msh")); + } } }