Merge pull request #3139 from Sonicadvance1/workaround

FEXServerClient: Adds back ServerSocketPath config option
This commit is contained in:
Ryan Houdek authored and GitHub committed 2023-09-23 17:09:04 -07:00
commit e795ec683d
1 file changed
+6 -1
+6 -1
View File
@@ -3,6 +3,7 @@
#include "Common/FEXServerClient.h"
#include <FEXCore/Utils/CompilerDefs.h>
#include <FEXCore/Utils/FileLoading.h>
#include <FEXCore/Utils/LogManager.h>
#include <FEXCore/Utils/NetStream.h>
#include <FEXCore/fextl/fmt.h>
@@ -143,7 +144,11 @@ namespace FEXServerClient {
}
fextl::string GetServerSocketName() {
return fextl::fmt::format("{}.FEXServer.Socket", ::geteuid());
FEX_CONFIG_OPT(ServerSocketPath, SERVERSOCKETPATH);
if (ServerSocketPath().empty()) {
return fextl::fmt::format("{}.FEXServer.Socket", ::geteuid());
}
return ServerSocketPath;
}
int GetServerFD() {